frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xc/programs/Xserver/fb/fb.h 

xc/programs/Xserver/fb/fboverlay.c
xc/programs/Xserver/fb/fbscreen.c
- Change #ifdef for checking for old format miScreenInit to
    FB_OLD_MISCREENINIT for easier portability to xservers with updated
    screen structs but old function prototypes. Make it automatically
    defined if FB_OLD_SCREEN is defined.
- Add _LP64 to list of #ifdefs for 64-bit platforms to support
64-bit Solaris.
This commit is contained in:
Alan Coopersmith 2004-05-16 05:08:39 +00:00
parent fc2dd516c3
commit 47fb207c8a
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fb/fb.h
View File

@ -22,6 +22,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $XdotOrg: $ */
#ifndef _FB_H_ #ifndef _FB_H_
#define _FB_H_ #define _FB_H_
@ -103,7 +105,7 @@ typedef unsigned __int64 FbBits;
# else # else
# if defined(__alpha__) || defined(__alpha) || \ # if defined(__alpha__) || defined(__alpha) || \
defined(ia64) || defined(__ia64__) || \ defined(ia64) || defined(__ia64__) || \
defined(__sparc64__) || \ defined(__sparc64__) || defined(_LP64) || \
defined(__s390x__) || \ defined(__s390x__) || \
defined(amd64) || defined (__amd64__) || \ defined(amd64) || defined (__amd64__) || \
(defined(sgi) && (_MIPS_SZLONG == 64)) (defined(sgi) && (_MIPS_SZLONG == 64))
@ -575,6 +577,7 @@ extern const GCFuncs fbGCFuncs;
#endif #endif
#ifdef FB_OLD_SCREEN #ifdef FB_OLD_SCREEN
# define FB_OLD_MISCREENINIT /* miScreenInit requires 14 args, not 13 */
extern WindowPtr *WindowTable; extern WindowPtr *WindowTable;
#endif #endif

6
fb/fboverlay.c
View File

@ -1,5 +1,5 @@
/* /*
* $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.6tsi Exp $ * $XFree86: xc/programs/Xserver/fb/fboverlay.c,v 1.7 2003/11/10 18:21:47 tsi Exp $
* *
* Copyright © 2000 SuSE, Inc. * Copyright © 2000 SuSE, Inc.
* *
@ -23,6 +23,8 @@
* Author: Keith Packard, SuSE, Inc. * Author: Keith Packard, SuSE, Inc.
*/ */
/* $XdotOrg: $ */
#include "fb.h" #include "fb.h"
#include "fboverlay.h" #include "fboverlay.h"
@ -402,7 +404,7 @@ fbOverlayFinishScreenInit(ScreenPtr pScreen,
if (! miScreenInit(pScreen, 0, xsize, ysize, dpix, dpiy, 0, if (! miScreenInit(pScreen, 0, xsize, ysize, dpix, dpiy, 0,
depth1, ndepths, depths, depth1, ndepths, depths,
defaultVisual, nvisuals, visuals defaultVisual, nvisuals, visuals
#ifdef FB_OLD_SCREEN #ifdef FB_OLD_MISCREENINIT
, (miBSFuncPtr) 0 , (miBSFuncPtr) 0
#endif #endif
)) ))

6
fb/fbscreen.c
View File

@ -1,4 +1,4 @@
/* /* $XdotOrg: $
* Id: fbscreen.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * Id: fbscreen.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
* *
* Copyright © 1998 Keith Packard * Copyright © 1998 Keith Packard
@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.11 2000/09/03 05:09:47 keithp Exp $ */ /* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */
#include "fb.h" #include "fb.h"
@ -229,7 +229,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
if (! miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width, if (! miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
rootdepth, ndepths, depths, rootdepth, ndepths, depths,
defaultVisual, nvisuals, visuals defaultVisual, nvisuals, visuals
#ifdef FB_OLD_SCREEN #ifdef FB_OLD_MISCREENINIT
, (miBSFuncPtr) 0 , (miBSFuncPtr) 0
#endif #endif
)) ))