summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2013-12-11 13:25:06 -0500
committerAdam Jackson <ajax@redhat.com>2013-12-13 14:56:05 -0500
commit8405ee4552565825d776e6a8963d33d9cd9cddf0 (patch)
tree8f2660c3d60919be4fc1ee58c24e5d0d9dadda55
parent7c5aa106e36e915d7b094833fac8a27996c50b24 (diff)
Force Window and Pixmap to be CARD32 on the wire
If you don't do this then the client libs on 64-bit machines see them as XIDs, which are 64-bit wide (sigh), which ruins the wire encoding and nothing works. Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--presentproto.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/presentproto.h b/presentproto.h
index 8303a94..ee65fa4 100644
--- a/presentproto.h
+++ b/presentproto.h
@@ -25,6 +25,8 @@
#include <X11/extensions/presenttokens.h>
+#define Window CARD32
+#define Pixmap CARD32
#define Region CARD32
#define XSyncFence CARD32
#define EventID CARD32
@@ -235,6 +237,8 @@ typedef struct {
#define sz_xPresentRedirectNotify 104
+#undef Window
+#undef Pixmap
#undef Region
#undef XSyncFence
#undef EventID