summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:37:33 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:37:33 +0000
commitbf6ca6fc3ef9bd61284dc48059d10a560e5c1f28 (patch)
treec7d764dae30b1400bfdc5a2da6286e582eed02c3
parent70a39df3be6fcfea3746e0e127f3cde03a538869 (diff)
downloadxorg-lib-libxkbfile-XORG-6_8_99_901.tar.gz
Fix more include paths; add dix-config.h to XKB code.XORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14
Diffstat
-rw-r--r--src/maprules.c9
-rw-r--r--src/xkbconfig.c11
-rw-r--r--src/xkberrs.c5
-rw-r--r--src/xkbmisc.c13
-rw-r--r--src/xkbout.c15
-rw-r--r--src/xkbtext.c15
-rw-r--r--src/xkmread.c15
7 files changed, 38 insertions, 45 deletions
diff --git a/src/maprules.c b/src/maprules.c
index 03ca51e..53decdc 100644
--- a/src/maprules.c
+++ b/src/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
diff --git a/src/xkbconfig.c b/src/xkbconfig.c
index 3d582d1..7930979 100644
--- a/src/xkbconfig.c
+++ b/src/xkbconfig.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>
@@ -51,15 +50,15 @@
#else
-#include "X.h"
+#include <X11/X.h>
#define NEED_EVENTS
#include <X11/keysym.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
#include "dix.h"
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#endif
#include <X11/extensions/XKBconfig.h>
diff --git a/src/xkberrs.c b/src/xkberrs.c
index 731d0b5..1b856bc 100644
--- a/src/xkberrs.c
+++ b/src/xkberrs.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>
diff --git a/src/xkbmisc.c b/src/xkbmisc.c
index f55ab5b..cca31f7 100644
--- a/src/xkbmisc.c
+++ b/src/xkbmisc.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>
@@ -51,16 +50,16 @@
#else
-#include "X.h"
+#include <X11/X.h>
#define NEED_EVENTS
#include <X11/keysym.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
#include "dix.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS 1
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#include <X11/extensions/XKBgeom.h>
#include "xkb.h"
diff --git a/src/xkbout.c b/src/xkbout.c
index cdf6995..b69fdfb 100644
--- a/src/xkbout.c
+++ b/src/xkbout.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>
@@ -49,19 +48,19 @@
#else
-#include "X.h"
+#include <X11/X.h>
#define NEED_EVENTS
#include <X11/keysym.h>
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
#include "dix.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS 1
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
#include <X11/extensions/XKBgeom.h>
-#include "extensions/XKBfile.h"
+#include <X11/extensions/XKBfile.h>
#endif
diff --git a/src/xkbtext.c b/src/xkbtext.c
index 0df7c89..28592d2 100644
--- a/src/xkbtext.c
+++ b/src/xkbtext.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>
@@ -50,16 +49,16 @@
#else
-#include "X.h"
+#include <X11/X.h>
#define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
#include "dix.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS 1
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
#endif
diff --git a/src/xkmread.c b/src/xkmread.c
index 3f38a4f..f22941f 100644
--- a/src/xkmread.c
+++ b/src/xkmread.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 <X11/Xos.h>
@@ -52,16 +51,16 @@
#else
-#include "X.h"
+#include <X11/X.h>
#define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include <X11/keysym.h>
#include "misc.h"
#include "inputstr.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
Atom
XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)
View Lorry Controller Status