X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb.h;h=d4d02b47faca5a380f77dcee1745d4b176e37749;hb=771761ccaad31d029d470dde84279e94494310b6;hp=27f57b8abf6d60852f1646dbeff4c1acb8b58805;hpb=9472c251ae426bb496a3112d0ae390f1f1c35515;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb.h b/src/xcb.h
index 27f57b8..d4d02b4 100644
--- a/src/xcb.h
+++ b/src/xcb.h
@@ -32,6 +32,8 @@
 /* TODO: check for stdint in config? (HAVE_STDINT) fallback? */
 #include <stdint.h>
 
+/* FIXME: these names conflict with those defined in Xmd.h. */
+#ifndef XMD_H
 typedef uint8_t  BYTE;
 typedef uint8_t  BOOL;
 typedef uint8_t  CARD8;
@@ -40,6 +42,7 @@ typedef uint32_t CARD32;
 typedef int8_t   INT8;
 typedef int16_t  INT16;
 typedef int32_t  INT32;
+#endif /* XMD_H */
 
 #include <X11/X.h>
 #include <sys/uio.h>
@@ -81,6 +84,12 @@ extern "C" {
 #define XCB_TYPE_PAD(T,I) (-(I) & (sizeof(T) > 4 ? 3 : sizeof(T) - 1))
 
 
+/** XCBNone is the universal null resource or null atom parameter value for many core X requests */
+#define XCBNone 0L
+
+/** XCBCopyFromParent can be used for many CreateWindow parameters */
+#define XCBCopyFromParent 0L
+
 /* Opaque structures */
 
 /**
@@ -264,9 +273,10 @@ XCBGenericEvent *XCBPollForEvent(XCBConnection *c, int *error);
  * processed. This function enables applications to determine whether
  * forcing a cookie is going to block.
  *
- * @todo review that function.
+ * @deprecated This function is deprecated in favor of XCBPollForReply.
+ * It must not be used in newly written code.
  */
-unsigned int XCBGetRequestRead(XCBConnection *c);
+unsigned int XCBGetRequestRead(XCBConnection *c) deprecated;
 
 
 /* xcb_ext.c */