X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb.h;h=e19b19d25071add92f84fe6b44b72013afcdee08;hb=8ba93ebb757706ae8dcf5af57c6e3812f72de80e;hp=85d065884c02652e9316a9fb8d879d7eaee11d9c;hpb=62749d54fd79b12123607599d58add126ce5de6e;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb.h b/src/xcb.h
index 85d0658..e19b19d 100644
--- a/src/xcb.h
+++ b/src/xcb.h
@@ -29,8 +29,11 @@
 #define __XCB_H__
 #include <sys/types.h>
 
-/* TODO: check for stdint in config? (HAVE_STDINT) fallback? */
+#if HAVE_STDINT_H
 #include <stdint.h>
+#elif HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
 
 /* FIXME: these names conflict with those defined in Xmd.h. */
 #ifndef XMD_H
@@ -44,7 +47,6 @@ typedef int16_t  INT16;
 typedef int32_t  INT32;
 #endif /* XMD_H */
 
-#include <X11/X.h>
 #include <sys/uio.h>
 #include <pthread.h>
 
@@ -156,8 +158,7 @@ typedef struct {
 } XCBVoidCookie;
 
 
-/* Include the generated xproto and xcb_types headers. */
-#include "xcb_types.h"
+/* Include the generated xproto header. */
 #include "xproto.h"