summaryrefslogtreecommitdiff
path: root/xkb/maprules.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:37:35 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:37:35 +0000
commit46b64bd5c66abb1bb9f3538c887d10867607bfff (patch)
tree300ec43d4ac86416fc063d9c7ccd17da78e0af0b /xkb/maprules.c
parente03198972ca78b03ad13cb49112c03a052bb763b (diff)
Fix more include paths; add dix-config.h to XKB code.
Diffstat (limited to 'xkb/maprules.c')
-rw-r--r--xkb/maprules.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/xkb/maprules.c b/xkb/maprules.c
index 03ca51eaa..53decdcad 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif
+
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
@@ -67,9 +66,9 @@
#include "misc.h"
#include "inputstr.h"
#include "dix.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#endif