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
commit 47fb207c8a
3 changed files with 11 additions and 6 deletions

View file

@ -1,4 +1,4 @@
/*
/* $XdotOrg: $
* Id: fbscreen.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
*
* Copyright © 1998 Keith Packard
@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* 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"
@ -229,7 +229,7 @@ fbFinishScreenInit(ScreenPtr pScreen,
if (! miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width,
rootdepth, ndepths, depths,
defaultVisual, nvisuals, visuals
#ifdef FB_OLD_SCREEN
#ifdef FB_OLD_MISCREENINIT
, (miBSFuncPtr) 0
#endif
))