projects
/
free-sw
/
xcb
/
libxcb
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4ff12a1
)
We do not conflict with Xmd.h anymore; remove the include hack from xcb_auth.c
author
Josh Triplett
<josh@freedesktop.org>
Sat, 23 Sep 2006 20:33:27 +0000
(13:33 -0700)
committer
Josh Triplett
<josh@freedesktop.org>
Sat, 23 Sep 2006 20:33:43 +0000
(13:33 -0700)
src/xcb_auth.c
patch
|
blob
|
history
diff --git
a/src/xcb_auth.c
b/src/xcb_auth.c
index
42a3d86
..
4c9f7d6
100644
(file)
--- a/
src/xcb_auth.c
+++ b/
src/xcb_auth.c
@@
-34,21
+34,13
@@
#include <unistd.h>
#include <stdlib.h>
#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
#ifdef HASXDMAUTH
#include <X11/Xdmcp.h>
#endif
-#include "xcb.h"
-#include "xcbint.h"
-
enum auth_protos {
#ifdef HASXDMAUTH
AUTH_XA1,
enum auth_protos {
#ifdef HASXDMAUTH
AUTH_XA1,