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/xkmread.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/xkmread.c')
| -rw-r--r-- | src/xkmread.c | 15 |
1 files changed, 7 insertions, 8 deletions
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) |