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/XKBMisc.c | |
| parent | e03198972ca78b03ad13cb49112c03a052bb763b (diff) | |
Fix more include paths; add dix-config.h to XKB code.
Diffstat (limited to 'xkb/XKBMisc.c')
| -rw-r--r-- | xkb/XKBMisc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index 6ad364127..09f361c19 100644 --- a/xkb/XKBMisc.c +++ b/xkb/XKBMisc.c @@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> +#elif defined(HAVE_CONFIG_H) +#include <config.h> #endif #ifndef XKB_IN_SERVER -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <stdio.h> #define NEED_REPLIES #define NEED_EVENTS @@ -46,15 +45,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #else #include <stdio.h> -#include "X.h" +#include <X11/X.h> #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include <X11/Xproto.h> #include "misc.h" #include "inputstr.h" #include <X11/keysym.h> #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include <X11/extensions/XKBsrv.h> #endif /* XKB_IN_SERVER */ |