* authorization from the authors.
*/
-#ifndef __XCB_H
-#define __XCB_H
+#ifndef __XCB_H__
+#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
typedef int32_t INT32;
#endif /* XMD_H */
-#include <X11/X.h>
#include <sys/uio.h>
#include <pthread.h>
+
#ifdef __cplusplus
extern "C" {
#endif
+
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
#define deprecated __attribute__((__deprecated__))
#else
} XCBVoidCookie;
-/* Include the generated xproto and xcb_types headers. */
-#include "xcb_types.h"
+/* Include the generated xproto header. */
#include "xproto.h"
}
#endif
-#endif
+
+#endif /* __XCB_H__ */