X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb.h;h=204164ad410c470554036f5e095abe88913f90be;hb=53971ea183d9d1dcfbaec18b135e49c9c118fabb;hp=7998d200815da81956340c730e665a7f63c87046;hpb=35ecaf45be75cb78fe18dd4ea9d564b03f6cea67;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb.h b/src/xcb.h index 7998d20..204164a 100644 --- a/src/xcb.h +++ b/src/xcb.h @@ -32,6 +32,8 @@ /* TODO: check for stdint in config? (HAVE_STDINT) fallback? */ #include +/* 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 #include