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 | 726538ba21b631bfb0b8094a5546acdaf57379ff (patch) | |
| tree | 3091686ff8b3dde0e70fc062f6889262d29e347e | |
| parent | 8c7677138e70e14eca0255f2168583f0ecc21994 (diff) | |
Fix more include paths; add dix-config.h to XKB code.XORG-6_8_99_14
| -rw-r--r-- | src/xkb/XKBAlloc.c | 13 | ||||
| -rw-r--r-- | src/xkb/XKBGAlloc.c | 19 | ||||
| -rw-r--r-- | src/xkb/XKBMAlloc.c | 11 | ||||
| -rw-r--r-- | src/xkb/XKBMisc.c | 11 |
4 files changed, 25 insertions, 29 deletions
diff --git a/src/xkb/XKBAlloc.c b/src/xkb/XKBAlloc.c index c415380..9430ac0 100644 --- a/src/xkb/XKBAlloc.c +++ b/src/xkb/XKBAlloc.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 @@ -47,14 +46,14 @@ 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 "XKBsrv.h" -#include "XKBgeom.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XKBgeom.h> #endif /* XKB_IN_SERVER */ diff --git a/src/xkb/XKBGAlloc.c b/src/xkb/XKBGAlloc.c index d5b9a1c..fddb770 100644 --- a/src/xkb/XKBGAlloc.c +++ b/src/xkb/XKBGAlloc.c @@ -26,18 +26,17 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.4 2001/01/17 19:41:48 dawes Exp $ */ -#define NEED_EVENTS -#define NEED_REPLIES - #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> +#elif defined(HAVE_CONFIG_H) +#include <config.h> #endif +#define NEED_EVENTS +#define NEED_REPLIES + #ifndef XKB_IN_SERVER -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <stdio.h> #include "Xlibint.h" #include "XKBlibint.h" @@ -47,12 +46,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #else #include <stdio.h> -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" -#include "XKBgeom.h" +#include <X11/extensions/XKBsrv.h> +#include <X11/extensions/XKBgeom.h> #endif /* XKB_IN_SERVER */ diff --git a/src/xkb/XKBMAlloc.c b/src/xkb/XKBMAlloc.c index db00206..91d87d5 100644 --- a/src/xkb/XKBMAlloc.c +++ b/src/xkb/XKBMAlloc.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 */ diff --git a/src/xkb/XKBMisc.c b/src/xkb/XKBMisc.c index 6ad3641..09f361c 100644 --- a/src/xkb/XKBMisc.c +++ b/src/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 */ |