diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-25 08:27:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-25 08:27:07 +0000 |
| commit | 27b0ed125725f09242054563bb65ac20cfaa17ff (patch) | |
| tree | 6fe92374761ae87d8541d117605db27f3486aee1 /xorg-server/include/colormapst.h | |
| parent | e8d899178e9ebe174e6b4a53297d3dfced8003f0 (diff) | |
| parent | 8268836508edd4ba2a3045c9ba937397df7bf2c5 (diff) | |
| download | vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.tar.gz vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.tar.bz2 vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/colormapst.h')
| -rw-r--r-- | xorg-server/include/colormapst.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/include/colormapst.h b/xorg-server/include/colormapst.h index 385c7969c..6f514c5db 100644 --- a/xorg-server/include/colormapst.h +++ b/xorg-server/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 */
|