projects
/
profile
/
ivi
/
libxcb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ccf721
)
The typedefs replacing Xmd.h conflict with Xmd.h. Here is a hacky workaround: FIXME!
author
Jamey Sharp
<jamey@minilop.net>
Thu, 16 Mar 2006 19:27:06 +0000
(11:27 -0800)
committer
Jamey Sharp
<jamey@minilop.net>
Thu, 16 Mar 2006 19:27:06 +0000
(11:27 -0800)
src/xcb.h
patch
|
blob
|
history
src/xcb_auth.c
patch
|
blob
|
history
diff --git
a/src/xcb.h
b/src/xcb.h
index
7998d20
..
204164a
100644
(file)
--- 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>
diff --git
a/src/xcb_auth.c
b/src/xcb_auth.c
index
d72d780
..
f42400d
100644
(file)
--- 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,