diff options
| author | Jamey Sharp <jamey@minilop.net> | 2006-03-16 11:27:06 -0800 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2006-03-16 11:27:06 -0800 |
| commit | df5d8adc1f18776e4417a03b465dae9273511fb1 (patch) | |
| tree | 9095ef4469d0b49b7841aa60bf770533e66c3af0 | |
| parent | 5ccf7216d266f22755e40a8b9858ebd60fd48f40 (diff) | |
The typedefs replacing Xmd.h conflict with Xmd.h. Here is a hacky workaround: FIXME!
| -rw-r--r-- | src/xcb.h | 3 | ||||
| -rw-r--r-- | src/xcb_auth.c | 12 |
2 files changed, 13 insertions, 2 deletions
@@ -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> diff --git a/src/xcb_auth.c b/src/xcb_auth.c index d72d780..f42400d 100644 --- a/src/xcb_auth.c +++ b/src/xcb_auth.c @@ -34,13 +34,21 @@ #include <unistd.h> #include <stdlib.h> -#include "xcb.h" -#include "xcbint.h" +/* FIXME: for the moment Xdmcp.h must be included before xcb.h because + * it includes Xmd.h, but config.h (normally included from xcbint.h + * which must be included after xcb.h) must be included before Xdmcp.h. + * Ow. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #ifdef HASXDMAUTH #include <X11/Xdmcp.h> #endif +#include "xcb.h" +#include "xcbint.h" + enum auth_protos { #ifdef HASXDMAUTH AUTH_XA1, |