From 46b64bd5c66abb1bb9f3538c887d10867607bfff Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 3 Jul 2005 07:37:35 +0000
Subject: Fix more include paths; add dix-config.h to XKB code.

---
 xkb/XKBMAlloc.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'xkb/XKBMAlloc.c')

diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index db0020691..91d87d57c 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
+#elif defined(HAVE_CONFIG_H)
+#include <config.h>
 #endif
 
 #ifndef XKB_IN_SERVER
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <stdio.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
@@ -46,15 +45,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #else 
 
 #include <stdio.h>
-#include "X.h"
+#include <X11/X.h>
 #define	NEED_EVENTS
 #define	NEED_REPLIES
-#include "Xproto.h"
+#include <X11/Xproto.h>
 #include "misc.h"
 #include "inputstr.h"
 #include <X11/keysym.h>
 #define	XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
 
 #endif /* XKB_IN_SERVER */
 
-- 
cgit v1.2.3