Fixed protocol errors under x86_64.

dimkr · Nov 14, 2013 · f67fdcf · f67fdcf
1 parent 761fff0
commit f67fdcf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/include/colormapst.h b/include/colormapst.h
@@ -48,6 +48,7 @@ SOFTWARE.
 #ifndef CMAPSTRUCT_H
 #define CMAPSTRUCT_H 1
 
+#include <X11/Xarch.h>
 #include "colormap.h"
 #include "screenint.h"
 
@@ -96,7 +97,14 @@ typedef struct _ColormapRec
 {
     VisualPtr	pVisual;
     short	class;		/* PseudoColor or DirectColor */
+#ifdef _XSERVER64
+    short	pad0;
+    XID		pad1;
+#endif
     long	mid;		/* client's name for colormap */
+#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
+    XID		pad2;
+#endif
     ScreenPtr	pScreen;	/* screen map is associated with */
     short	flags;		/* 1 = IsDefault
 				 * 2 = AllAllocated */

diff --git a/include/pixmapstr.h b/include/pixmapstr.h
@@ -51,13 +51,20 @@ SOFTWARE.
 #include "pixmap.h"
 #include "screenint.h"
 #include "miscstruct.h"
+#include "X.h"
 
 typedef struct _Drawable {
     unsigned char	type;	/* DRAWABLE_<type> */
     unsigned char	class;	/* specific to type */
     unsigned char	depth;
     unsigned char	bitsPerPixel;
-    unsigned long	id;	/* resource id */
+#if defined(_XSERVER64)
+    XID			pad0;
+#endif
+    XID			id;	/* resource id */
+#if defined(_XSERVER64)
+    XID			pad1;
+#endif
     short		x;	/* window: screen absolute, pixmap: 0 */
     short		y;	/* window: screen absolute, pixmap: 0 */
     unsigned short	width;