704bf4
From 6d9585ba6a5784328de479c6b648d7b7d6cec64c Mon Sep 17 00:00:00 2001
704bf4
From: Adam Jackson <ajax@redhat.com>
704bf4
Date: Thu, 29 Oct 2009 19:04:10 -0400
704bf4
Subject: [PATCH] multilib fix for -devel subpackage
704bf4
704bf4
---
704bf4
 include/colormapst.h     |    4 ++--
704bf4
 include/xorg-server.h.in |    7 ++++---
704bf4
 2 files changed, 6 insertions(+), 5 deletions(-)
704bf4
704bf4
diff --git a/include/colormapst.h b/include/colormapst.h
704bf4
index f1fc8eb..274cd65 100644
704bf4
--- a/include/colormapst.h
704bf4
+++ b/include/colormapst.h
704bf4
@@ -103,12 +103,12 @@ typedef struct _ColormapRec
704bf4
 {
704bf4
     VisualPtr	pVisual;
704bf4
     short	class;		/* PseudoColor or DirectColor */
704bf4
-#if defined(_XSERVER64)
704bf4
+#ifdef __LP64__
704bf4
     short	pad0;
704bf4
     XID		pad1;
704bf4
 #endif
704bf4
     XID		mid;		/* client's name for colormap */
704bf4
-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
704bf4
+#if defined(__LP64__) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
704bf4
     XID		pad2;
704bf4
 #endif
704bf4
     ScreenPtr	pScreen;	/* screen map is associated with */
704bf4
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
704bf4
index 76cab16..081b8f3 100644
704bf4
--- a/include/xorg-server.h.in
704bf4
+++ b/include/xorg-server.h.in
704bf4
@@ -157,9 +157,6 @@
704bf4
 /* Name of X server */
704bf4
 #undef __XSERVERNAME__
704bf4
 
704bf4
-/* Define to 1 if unsigned long is 64 bits. */
704bf4
-#undef _XSERVER64
704bf4
-
704bf4
 /* Building vgahw module */
704bf4
 #undef WITH_VGAHW
704bf4
 
704bf4
@@ -187,4 +184,8 @@
704bf4
 /* X Access Control Extension */
704bf4
 #undef XACE
704bf4
 
704bf4
+#ifdef __LP64__
704bf4
+#define _XSERVER64 1
704bf4
+#endif
704bf4
+
704bf4
 #endif /* _XORG_SERVER_H_ */
704bf4
-- 
704bf4
1.6.5.2
704bf4