diff options
author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:37:33 +0000 |
---|---|---|
committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:37:33 +0000 |
commit | bf6ca6fc3ef9bd61284dc48059d10a560e5c1f28 (patch) | |
tree | c7d764dae30b1400bfdc5a2da6286e582eed02c3 /src/xkbmisc.c | |
parent | 70a39df3be6fcfea3746e0e127f3cde03a538869 (diff) |
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 (limited to 'src/xkbmisc.c')
-rw-r--r-- | src/xkbmisc.c | 13 |
1 files changed, 6 insertions, 7 deletions
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" |