andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: Fix the sdk headers to be multilib-safe

Browse Source 
Use _LP64 (verified on gcc and sun compilers) instead of _XSERVER64 in
internal header usage, and always define _XSERVER64 for modules if _LP64
is defined.  Prevents differing xorg-server.h between 32 and 64 bit
packages.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2010-02-08 15:40:22 -05:00
parent dc498b433f
commit a16e282200
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/colormapst.h
View File

@ -103,12 +103,12 @@ typedef struct _ColormapRec
{ {
VisualPtr pVisual; VisualPtr pVisual;
short class; /* PseudoColor or DirectColor */ short class; /* PseudoColor or DirectColor */
#if defined(_XSERVER64) #if defined(_LP64)
short pad0; short pad0;
XID pad1; XID pad1;
#endif #endif
XID mid; /* client's name for colormap */ XID mid; /* client's name for colormap */
#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) #if defined(_LP64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
XID pad2; XID pad2;
#endif #endif
ScreenPtr pScreen; /* screen map is associated with */ ScreenPtr pScreen; /* screen map is associated with */

7
include/xorg-server.h.in
View File

@ -157,9 +157,6 @@
/* Name of X server */ /* Name of X server */
#undef __XSERVERNAME__ #undef __XSERVERNAME__
/* Define to 1 if unsigned long is 64 bits. */
#undef _XSERVER64
/* Building vgahw module */ /* Building vgahw module */
#undef WITH_VGAHW #undef WITH_VGAHW
@ -187,4 +184,8 @@
/* X Access Control Extension */ /* X Access Control Extension */
#undef XACE #undef XACE
#ifdef _LP64
#define _XSERVER64 1
#endif
#endif /* _XORG_SERVER_H_ */ #endif /* _XORG_SERVER_H_ */