From 46b64bd5c66abb1bb9f3538c887d10867607bfff Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sun, 3 Jul 2005 07:37:35 +0000 Subject: [PATCH] Fix more include paths; add dix-config.h to XKB code. --- composite/compalloc.c | 3 --- composite/compext.c | 3 --- composite/compinit.c | 3 --- composite/compwindow.c | 3 --- damageext/damageext.c | 3 --- fb/fbcompose.c | 4 +--- fb/fbedge.c | 3 --- miext/damage/damage.c | 3 --- render/filter.c | 3 --- render/picture.c | 3 --- xfixes/cursor.c | 3 --- xfixes/region.c | 3 --- xfixes/saveset.c | 3 --- xfixes/select.c | 3 --- xfixes/xfixes.c | 3 --- xkb/XKBAlloc.c | 13 ++++++------- xkb/XKBGAlloc.c | 21 ++++++++++----------- xkb/XKBMAlloc.c | 11 +++++------ xkb/XKBMisc.c | 11 +++++------ xkb/maprules.c | 9 ++++----- xkb/xkbconfig.c | 11 +++++------ xkb/xkberrs.c | 5 ++--- xkb/xkbfmisc.c | 13 ++++++------- xkb/xkbout.c | 15 +++++++-------- xkb/xkbtext.c | 15 +++++++-------- xkb/xkmread.c | 15 +++++++-------- 26 files changed, 65 insertions(+), 120 deletions(-) diff --git a/composite/compalloc.c b/composite/compalloc.c index 005c16209e..aabacbe7b0 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "compint.h" void diff --git a/composite/compext.c b/composite/compext.c index e2b316edd1..8b1d454033 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "compint.h" static CARD8 CompositeReqCode; diff --git a/composite/compinit.c b/composite/compinit.c index bc4099ba7c..07048dbb6a 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "compint.h" int CompScreenPrivateIndex; diff --git a/composite/compwindow.c b/composite/compwindow.c index f12cdf7ae5..2f5e83cda1 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "compint.h" #ifdef COMPOSITE_DEBUG diff --git a/damageext/damageext.c b/damageext/damageext.c index 26015c4350..616d55ecc2 100755 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "damageextint.h" unsigned char DamageReqCode; diff --git a/fb/fbcompose.c b/fb/fbcompose.c index 8cb0c86ccd..6cbf2daf6b 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -24,13 +24,11 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ + #ifdef HAVE_DIX_CONFIG_H #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "fb.h" #ifdef RENDER diff --git a/fb/fbedge.c b/fb/fbedge.c index f3311c6dff..fc52bc9756 100644 --- a/fb/fbedge.c +++ b/fb/fbedge.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "fb.h" #ifdef RENDER diff --git a/miext/damage/damage.c b/miext/damage/damage.c index dfebffe909..9fb3d8ee3b 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include #include "scrnintstr.h" #include "windowstr.h" diff --git a/render/filter.c b/render/filter.c index d2e8bcc030..bee26dde71 100644 --- a/render/filter.c +++ b/render/filter.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include #include "scrnintstr.h" #include diff --git a/render/picture.c b/render/picture.c index e83b1d07da..a13ac5d057 100644 --- a/render/picture.c +++ b/render/picture.c @@ -27,9 +27,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include #include "scrnintstr.h" #include diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 25b0fac6eb..6895b6f00f 100755 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "xfixesint.h" #include "scrnintstr.h" #include "cursorstr.h" diff --git a/xfixes/region.c b/xfixes/region.c index 1ee2cd7440..d317f73135 100755 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "xfixesint.h" #include "scrnintstr.h" #ifdef RENDER diff --git a/xfixes/saveset.c b/xfixes/saveset.c index 780aeb57b1..9ebf245845 100755 --- a/xfixes/saveset.c +++ b/xfixes/saveset.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "xfixesint.h" int diff --git a/xfixes/select.c b/xfixes/select.c index 71addd4709..4c7a49def0 100755 --- a/xfixes/select.c +++ b/xfixes/select.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "xfixesint.h" static RESTYPE SelectionClientType, SelectionWindowType; diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c index 38e9b39c15..b2cd4afaa6 100755 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -26,9 +26,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include -#endif #include "xfixesint.h" unsigned char XFixesReqCode; diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index c415380ee7..9430ac0edf 100644 --- a/xkb/XKBAlloc.c +++ b/xkb/XKBAlloc.c @@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_DIX_CONFIG_H #include +#elif defined(HAVE_CONFIG_H) +#include #endif #ifndef XKB_IN_SERVER -#ifdef HAVE_CONFIG_H -#include -#endif #include #define NEED_REPLIES #define NEED_EVENTS @@ -47,14 +46,14 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #else #include -#include "X.h" +#include #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include #endif /* XKB_IN_SERVER */ diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index d5b9a1c934..fddb770b65 100644 --- a/xkb/XKBGAlloc.c +++ b/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 $ */ +#ifdef HAVE_DIX_CONFIG_H +#include +#elif defined(HAVE_CONFIG_H) +#include +#endif + #define NEED_EVENTS #define NEED_REPLIES -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XKB_IN_SERVER -#ifdef HAVE_CONFIG_H -#include -#endif #include #include "Xlibint.h" #include "XKBlibint.h" @@ -47,12 +46,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #else #include -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include #endif /* XKB_IN_SERVER */ diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index db0020691a..91d87d57c3 100644 --- a/xkb/XKBMAlloc.c +++ b/xkb/XKBMAlloc.c @@ -28,13 +28,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_DIX_CONFIG_H #include +#elif defined(HAVE_CONFIG_H) +#include #endif #ifndef XKB_IN_SERVER -#ifdef HAVE_CONFIG_H -#include -#endif #include #define NEED_REPLIES #define NEED_EVENTS @@ -46,15 +45,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #else #include -#include "X.h" +#include #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #endif /* XKB_IN_SERVER */ diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index 6ad3641275..09f361c192 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 +#elif defined(HAVE_CONFIG_H) +#include #endif #ifndef XKB_IN_SERVER -#ifdef HAVE_CONFIG_H -#include -#endif #include #define NEED_REPLIES #define NEED_EVENTS @@ -46,15 +45,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #else #include -#include "X.h" +#include #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #endif /* XKB_IN_SERVER */ diff --git a/xkb/maprules.c b/xkb/maprules.c index 03ca51eaa7..53decdcad9 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -28,11 +28,10 @@ #ifdef HAVE_DIX_CONFIG_H #include -#endif - -#ifdef HAVE_CONFIG_H +#elif defined(HAVE_CONFIG_H) #include #endif + #include #include #include @@ -67,9 +66,9 @@ #include "misc.h" #include "inputstr.h" #include "dix.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #endif diff --git a/xkb/xkbconfig.c b/xkb/xkbconfig.c index 3d582d1fb2..7930979eb1 100644 --- a/xkb/xkbconfig.c +++ b/xkb/xkbconfig.c @@ -28,11 +28,10 @@ #ifdef HAVE_DIX_CONFIG_H #include -#endif - -#ifdef HAVE_CONFIG_H +#elif defined(HAVE_CONFIG_H) #include #endif + #include #include #include @@ -51,15 +50,15 @@ #else -#include "X.h" +#include #define NEED_EVENTS #include -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include "dix.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #endif #include diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c index 731d0b5cfc..1b856bcaf2 100644 --- a/xkb/xkberrs.c +++ b/xkb/xkberrs.c @@ -28,11 +28,10 @@ #ifdef HAVE_DIX_CONFIG_H #include -#endif - -#ifdef HAVE_CONFIG_H +#elif defined(HAVE_CONFIG_H) #include #endif + #include #include #include diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index f55ab5bdf5..cca31f7787 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -28,11 +28,10 @@ #ifdef HAVE_DIX_CONFIG_H #include -#endif - -#ifdef HAVE_CONFIG_H +#elif defined(HAVE_CONFIG_H) #include #endif + #include #include #include @@ -51,16 +50,16 @@ #else -#include "X.h" +#include #define NEED_EVENTS #include -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include "XKBsrv.h" +#include #include #include "xkb.h" diff --git a/xkb/xkbout.c b/xkb/xkbout.c index cdf699509f..b69fdfbb4a 100644 --- a/xkb/xkbout.c +++ b/xkb/xkbout.c @@ -28,11 +28,10 @@ #ifdef HAVE_DIX_CONFIG_H #include -#endif - -#ifdef HAVE_CONFIG_H +#elif defined(HAVE_CONFIG_H) #include #endif + #include #include #include @@ -49,19 +48,19 @@ #else -#include "X.h" +#include #define NEED_EVENTS #include -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include "XKBsrv.h" +#include #include -#include "extensions/XKBfile.h" +#include #endif diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index 0df7c894b4..28592d2424 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -28,11 +28,10 @@ #ifdef HAVE_DIX_CONFIG_H #include -#endif - -#ifdef HAVE_CONFIG_H +#elif defined(HAVE_CONFIG_H) #include #endif + #include #include #include @@ -50,16 +49,16 @@ #else -#include "X.h" +#include #define NEED_EVENTS -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include #endif diff --git a/xkb/xkmread.c b/xkb/xkmread.c index 3f38a4f962..f22941f67e 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -28,11 +28,10 @@ #ifdef HAVE_DIX_CONFIG_H #include -#endif - -#ifdef HAVE_CONFIG_H +#elif defined(HAVE_CONFIG_H) #include #endif + #include #include @@ -52,16 +51,16 @@ #else -#include "X.h" +#include #define NEED_EVENTS -#include "Xproto.h" +#include #include #include "misc.h" #include "inputstr.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include Atom XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)