summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2010-02-08 15:40:22 -0500
committerAdam Jackson <ajax@redhat.com>2011-02-23 13:39:22 -0500
commita16e282200f84233041e5a565c6363a5a78be525 (patch)
treed547d50b33e5e0a53bea5df2ed7a33749d63f108
parentdc498b433f36af5d2de3065e7c64cdb575385d81 (diff)
xfree86: Fix the sdk headers to be multilib-safe
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>
-rw-r--r--include/colormapst.h4
-rw-r--r--include/xorg-server.h.in7
2 files changed, 6 insertions, 5 deletions
diff --git a/include/colormapst.h b/include/colormapst.h
index 0ba5bd0b5..b597e2c60 100644
--- a/include/colormapst.h
+++ b/include/colormapst.h
@@ -103,12 +103,12 @@ typedef struct _ColormapRec
{
VisualPtr pVisual;
short class; /* PseudoColor or DirectColor */
-#if defined(_XSERVER64)
+#if defined(_LP64)
short pad0;
XID pad1;
#endif
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;
#endif
ScreenPtr pScreen; /* screen map is associated with */
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 76cab16b6..b10b9949e 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -157,9 +157,6 @@
/* Name of X server */
#undef __XSERVERNAME__
-/* Define to 1 if unsigned long is 64 bits. */
-#undef _XSERVER64
-
/* Building vgahw module */
#undef WITH_VGAHW
@@ -187,4 +184,8 @@
/* X Access Control Extension */
#undef XACE
+#ifdef _LP64
+#define _XSERVER64 1
+#endif
+
#endif /* _XORG_SERVER_H_ */