Remove dependencies on Xmd.h and X.h

[free-sw/xcb/libxcb] / src / xcb.h

diff --git a/src/xcb.h b/src/xcb.h
index 8dd308a..18785ab 100644 (file)
--- a/src/xcb.h
+++ b/src/xcb.h
@@ -27,7 +27,20 @@
 
 #ifndef __XCB_H
 #define __XCB_H
-#include <X11/Xmd.h>
+#include <sys/types.h>
+
+/* TODO: check for stdint in config? (HAVE_STDINT) fallback? */
+#include <stdint.h>
+
+typedef uint8_t  BYTE;
+typedef uint8_t  BOOL;
+typedef uint8_t  CARD8;
+typedef uint16_t CARD16;
+typedef uint32_t CARD32;
+typedef int8_t   INT8;
+typedef int16_t  INT16;
+typedef int32_t  INT32;
+
 #include <X11/X.h>
 #include <sys/uio.h>
 #include <pthread.h>
@@ -80,12 +93,16 @@ typedef struct {
     BYTE response_type;
     CARD8 pad0;
     CARD16 sequence;
+    CARD32 pad[7];
+    CARD32 full_sequence;
 } XCBGenericEvent;
 
 typedef struct {
     BYTE response_type;
     BYTE error_code;
     CARD16 sequence;
+    CARD32 pad[7];
+    CARD32 full_sequence;
 } XCBGenericError;
 
 typedef struct {