summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2006-09-23 13:33:27 -0700
committerJosh Triplett <josh@freedesktop.org>2006-09-23 13:33:43 -0700
commit86a4c0cc284366bbb01898a77df360278d5a8194 (patch)
treecda7f8c1577a14f4dfca269c87a72dbfc1050ec7
parent4ff12a1a94895837dc85ac9e37fd1a5f40819cf3 (diff)
We do not conflict with Xmd.h anymore; remove the include hack from xcb_auth.c
-rw-r--r--src/xcb_auth.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/xcb_auth.c b/src/xcb_auth.c
index 42a3d86..4c9f7d6 100644
--- a/src/xcb_auth.c
+++ b/src/xcb_auth.c
@@ -34,21 +34,13 @@
#include <unistd.h>
#include <stdlib.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
+#include "xcb.h"
+#include "xcbint.h"
#ifdef HASXDMAUTH
#include <X11/Xdmcp.h>
#endif
-#include "xcb.h"
-#include "xcbint.h"
-
enum auth_protos {
#ifdef HASXDMAUTH
AUTH_XA1,