77cc640685
- Drop hal→udev migration warning. Two releases later should be enough. - xserver-1.8.0-no-xorg.patch: drop, upstream - xserver-1.7.0-randr-gamma-restore.patch: drop, upstream - xserver-1.7.1-gamma-kdm-fix.patch: drop, upstream - xserver-1.9.0-tcflush-fix.patch: drop, upstream - xserver-1.9.1-pxtc-crash.patch: drop, upstream - xserver-1.9.0-vbe-panelid-sanity.patch: drop, upstream - xserver-1.9.0-classic-default-mode.patch: drop, upstream
56 lines
1.4 KiB
Diff
56 lines
1.4 KiB
Diff
From d9b6e996135efb8a8e23605665aab5c3c1f0f941 Mon Sep 17 00:00:00 2001
|
|
From: Adam Jackson <ajax@redhat.com>
|
|
Date: Thu, 29 Oct 2009 19:04:10 -0400
|
|
Subject: [PATCH] multilib fix for -devel subpackage
|
|
|
|
---
|
|
include/colormapst.h | 4 ++--
|
|
include/xorg-server.h.in | 7 ++++---
|
|
2 files changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/include/colormapst.h b/include/colormapst.h
|
|
index 0ba5bd0..d24ea58 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)
|
|
+#ifdef __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 76cab16..d12fd23 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_ */
|
|
--
|
|
1.7.3.2
|
|
|