]>
Commit | Line | Data |
---|---|---|
313ed234 SS |
1 | From 6d9585ba6a5784328de479c6b648d7b7d6cec64c Mon Sep 17 00:00:00 2001 |
2 | From: Adam Jackson <ajax@redhat.com> | |
3 | Date: Thu, 29 Oct 2009 19:04:10 -0400 | |
4 | Subject: [PATCH] multilib fix for -devel subpackage | |
5 | ||
6 | --- | |
7 | include/colormapst.h | 4 ++-- | |
8 | include/xorg-server.h.in | 7 ++++--- | |
9 | 2 files changed, 6 insertions(+), 5 deletions(-) | |
10 | ||
11 | diff --git a/include/colormapst.h b/include/colormapst.h | |
12 | index f1fc8eb..274cd65 100644 | |
13 | --- a/include/colormapst.h | |
14 | +++ b/include/colormapst.h | |
15 | @@ -103,12 +103,12 @@ typedef struct _ColormapRec | |
16 | { | |
17 | VisualPtr pVisual; | |
18 | short class; /* PseudoColor or DirectColor */ | |
19 | -#if defined(_XSERVER64) | |
20 | +#ifdef __LP64__ | |
21 | short pad0; | |
22 | XID pad1; | |
23 | #endif | |
24 | XID mid; /* client's name for colormap */ | |
25 | -#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) | |
26 | +#if defined(__LP64__) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) | |
27 | XID pad2; | |
28 | #endif | |
29 | ScreenPtr pScreen; /* screen map is associated with */ | |
30 | diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in | |
31 | index 76cab16..081b8f3 100644 | |
32 | --- a/include/xorg-server.h.in | |
33 | +++ b/include/xorg-server.h.in | |
34 | @@ -157,9 +157,6 @@ | |
35 | /* Name of X server */ | |
36 | #undef __XSERVERNAME__ | |
37 | ||
38 | -/* Define to 1 if unsigned long is 64 bits. */ | |
39 | -#undef _XSERVER64 | |
40 | - | |
41 | /* Building vgahw module */ | |
42 | #undef WITH_VGAHW | |
43 | ||
44 | @@ -187,4 +184,8 @@ | |
45 | /* X Access Control Extension */ | |
46 | #undef XACE | |
47 | ||
48 | +#ifdef __LP64__ | |
49 | +#define _XSERVER64 1 | |
50 | +#endif | |
51 | + | |
52 | #endif /* _XORG_SERVER_H_ */ | |
53 | -- | |
54 | 1.6.5.2 | |
55 |