diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:37:35 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:37:35 +0000 |
| commit | 46b64bd5c66abb1bb9f3538c887d10867607bfff (patch) | |
| tree | 300ec43d4ac86416fc063d9c7ccd17da78e0af0b /xkb/xkbout.c | |
| parent | e03198972ca78b03ad13cb49112c03a052bb763b (diff) | |
Fix more include paths; add dix-config.h to XKB code.
Diffstat (limited to 'xkb/xkbout.c')
| -rw-r--r-- | xkb/xkbout.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/xkb/xkbout.c b/xkb/xkbout.c index cdf699509..b69fdfbb4 100644 --- a/xkb/xkbout.c +++ b/xkb/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 |