diff options
Diffstat (limited to 'miext')
51 files changed, 223 insertions, 19 deletions
diff --git a/miext/cw/cw.c b/miext/cw/cw.c index 72f96e13e..2b8010f50 100644 --- a/miext/cw/cw.c +++ b/miext/cw/cw.c @@ -21,6 +21,10 @@ */ /* $Header$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "windowstr.h" #include "cw.h" diff --git a/miext/cw/cw.h b/miext/cw/cw.h index 20be80205..1f8c400e2 100644 --- a/miext/cw/cw.h +++ b/miext/cw/cw.h @@ -21,6 +21,10 @@ */ /* $Header$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "picturestr.h" /* diff --git a/miext/cw/cw_ops.c b/miext/cw/cw_ops.c index 9df12d6d0..80168a336 100644 --- a/miext/cw/cw_ops.c +++ b/miext/cw/cw_ops.c @@ -21,6 +21,10 @@ */ /* $Header$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "cw.h" diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c index 73d893b16..82ca006d2 100644 --- a/miext/cw/cw_render.c +++ b/miext/cw/cw_render.c @@ -21,6 +21,10 @@ */ /* $Header$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "windowstr.h" #include "cw.h" diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 31238cc4a..dfebffe90 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -22,15 +22,19 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/damage/damage.h b/miext/damage/damage.h index 7ed1b1823..c760f6bef 100755 --- a/miext/damage/damage.h +++ b/miext/damage/damage.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DAMAGE_H_ #define _DAMAGE_H_ diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 39b50660a..772a7ec35 100755 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DAMAGESTR_H_ #define _DAMAGESTR_H_ diff --git a/miext/layer/layer.h b/miext/layer/layer.h index 1cb410e4c..e8f3a856e 100644 --- a/miext/layer/layer.h +++ b/miext/layer/layer.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _LAYER_H_ #define _LAYER_H_ diff --git a/miext/layer/layergc.c b/miext/layer/layergc.c index b0153b49b..343edfcf5 100644 --- a/miext/layer/layergc.c +++ b/miext/layer/layergc.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "layerstr.h" GCFuncs layerGCFuncs = { diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c index 615bed361..994c6747c 100644 --- a/miext/layer/layerinit.c +++ b/miext/layer/layerinit.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "layerstr.h" int layerScrPrivateIndex; diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c index 1719edd7b..16e46f0ab 100644 --- a/miext/layer/layerpict.c +++ b/miext/layer/layerpict.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "layerstr.h" void diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h index 91393adc4..fb5a0d411 100644 --- a/miext/layer/layerstr.h +++ b/miext/layer/layerstr.h @@ -22,15 +22,19 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _LAYERSTR_H_ #define _LAYERSTR_H_ #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c index 1119e6048..7afe90ade 100644 --- a/miext/layer/layerwin.c +++ b/miext/layer/layerwin.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "layerstr.h" static LayerListPtr diff --git a/miext/rootless/accel/rlAccel.c b/miext/rootless/accel/rlAccel.c index 0b8152857..188fd4872 100644 --- a/miext/rootless/accel/rlAccel.c +++ b/miext/rootless/accel/rlAccel.c @@ -35,6 +35,10 @@ * underneath this layer besides fb will get called. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "rootless.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlAccel.h b/miext/rootless/accel/rlAccel.h index b1488bdef..a4402bdf2 100644 --- a/miext/rootless/accel/rlAccel.h +++ b/miext/rootless/accel/rlAccel.h @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" /* diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c index ad4ebf199..e5fa5f7bd 100644 --- a/miext/rootless/accel/rlBlt.c +++ b/miext/rootless/accel/rlBlt.c @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rootlessCommon.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlCopy.c b/miext/rootless/accel/rlCopy.c index 46bca34f9..ccea7fbd3 100644 --- a/miext/rootless/accel/rlCopy.c +++ b/miext/rootless/accel/rlCopy.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFill.c b/miext/rootless/accel/rlFill.c index 4409663c0..a6ed2fbbb 100644 --- a/miext/rootless/accel/rlFill.c +++ b/miext/rootless/accel/rlFill.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillRect.c b/miext/rootless/accel/rlFillRect.c index 34789aa27..e4bab4f53 100644 --- a/miext/rootless/accel/rlFillRect.c +++ b/miext/rootless/accel/rlFillRect.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillSpans.c b/miext/rootless/accel/rlFillSpans.c index 18a61a944..9942d70e4 100644 --- a/miext/rootless/accel/rlFillSpans.c +++ b/miext/rootless/accel/rlFillSpans.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlGlyph.c b/miext/rootless/accel/rlGlyph.c index 775032ed4..3f1571963 100644 --- a/miext/rootless/accel/rlGlyph.c +++ b/miext/rootless/accel/rlGlyph.c @@ -24,8 +24,12 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlSolid.c b/miext/rootless/accel/rlSolid.c index 15aa2ae43..edce3d2c4 100644 --- a/miext/rootless/accel/rlSolid.c +++ b/miext/rootless/accel/rlSolid.c @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rootlessCommon.h" diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index 7612f00fa..dec0e2c64 100644 --- a/miext/rootless/rootless.h +++ b/miext/rootless/rootless.h @@ -29,6 +29,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.7 2004/07/02 01:30:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _ROOTLESS_H #define _ROOTLESS_H diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c index b24d2a226..33321105e 100644 --- a/miext/rootless/rootlessCommon.c +++ b/miext/rootless/rootlessCommon.c @@ -30,6 +30,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.6 2004/07/02 01:30:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "rootlessCommon.h" unsigned int rootless_CopyBytes_threshold = 0; diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index b5fcae7f9..beb1fd666 100644 --- a/miext/rootless/rootlessCommon.h +++ b/miext/rootless/rootlessCommon.h @@ -29,6 +29,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.5 2004/07/02 01:30:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _ROOTLESSCOMMON_H #define _ROOTLESSCOMMON_H diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index ccd0cc776..eabbaef43 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index fa10241f2..61987addb 100644 --- a/miext/rootless/rootlessGC.c +++ b/miext/rootless/rootlessGC.c @@ -30,6 +30,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mi.h" #include "scrnintstr.h" #include "gcstruct.h" diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 21c62c4ef..6b7697383 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -31,6 +31,10 @@ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.2 2003/04/30 23:15:35 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mi.h" #include "scrnintstr.h" #include "gcstruct.h" diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index 51a2e99ad..2717ddf6f 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -90,6 +90,10 @@ Equipment Corporation. * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "validate.h" diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 505db5ad5..f105a9113 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -31,6 +31,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.12 2004/07/02 01:30:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "rootlessCommon.h" #include "rootlessWindow.h" diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h index 6c26bace3..9cceed347 100644 --- a/miext/rootless/rootlessWindow.h +++ b/miext/rootless/rootlessWindow.h @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _ROOTLESSWINDOW_H #define _ROOTLESSWINDOW_H diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index 2c2a26201..46ddfbb6c 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -23,12 +23,16 @@ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index 85b2604f5..3d50b5a84 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _SHADOW_H_ #define _SHADOW_H_ diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 0514b9a2e..5c01f2aac 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -23,12 +23,16 @@ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 5a19bcc4b..3fdee1473 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -22,12 +22,16 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index e9fc784b4..979905b86 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -22,12 +22,16 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index f2a2215ed..f1d87dc50 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -22,12 +22,16 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c index 0928464f2..2ec41bb07 100644 --- a/miext/shadow/shrot16pack.c +++ b/miext/shadow/shrot16pack.c @@ -25,4 +25,8 @@ #define FUNC shadowUpdateRotate16 #define Data CARD16 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c index d51511260..06b1603ba 100644 --- a/miext/shadow/shrot16pack_180.c +++ b/miext/shadow/shrot16pack_180.c @@ -26,4 +26,8 @@ #define Data CARD16 #define ROTATE 180 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c index ea22717b0..1ad952ec6 100644 --- a/miext/shadow/shrot16pack_270.c +++ b/miext/shadow/shrot16pack_270.c @@ -26,4 +26,8 @@ #define Data CARD16 #define ROTATE 270 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c index 71027d92a..cfef7785c 100644 --- a/miext/shadow/shrot16pack_90.c +++ b/miext/shadow/shrot16pack_90.c @@ -26,4 +26,8 @@ #define Data CARD16 #define ROTATE 90 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c index 1415bab80..95c7c292c 100644 --- a/miext/shadow/shrot32pack.c +++ b/miext/shadow/shrot32pack.c @@ -25,4 +25,8 @@ #define FUNC shadowUpdateRotate32 #define Data CARD32 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c index 003aeecd8..cbadba59d 100644 --- a/miext/shadow/shrot32pack_180.c +++ b/miext/shadow/shrot32pack_180.c @@ -26,4 +26,8 @@ #define Data CARD32 #define ROTATE 180 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c index 4f1f0d31f..8f434b08e 100644 --- a/miext/shadow/shrot32pack_270.c +++ b/miext/shadow/shrot32pack_270.c @@ -26,4 +26,8 @@ #define Data CARD32 #define ROTATE 270 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c index 7c3e781a8..98c22c37d 100644 --- a/miext/shadow/shrot32pack_90.c +++ b/miext/shadow/shrot32pack_90.c @@ -26,4 +26,8 @@ #define Data CARD32 #define ROTATE 90 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c index c59bc2078..9e77f43e8 100644 --- a/miext/shadow/shrot8pack.c +++ b/miext/shadow/shrot8pack.c @@ -25,4 +25,8 @@ #define FUNC shadowUpdateRotate8 #define Data CARD8 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c index 095843f13..6f4eca93e 100644 --- a/miext/shadow/shrot8pack_180.c +++ b/miext/shadow/shrot8pack_180.c @@ -26,4 +26,8 @@ #define Data CARD8 #define ROTATE 180 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c index f558538ff..d56a3366c 100644 --- a/miext/shadow/shrot8pack_270.c +++ b/miext/shadow/shrot8pack_270.c @@ -26,4 +26,8 @@ #define Data CARD8 #define ROTATE 270 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c index 108552f42..2fed8126d 100644 --- a/miext/shadow/shrot8pack_90.c +++ b/miext/shadow/shrot8pack_90.c @@ -26,4 +26,8 @@ #define Data CARD8 #define ROTATE 90 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index f870ef05c..927bc61be 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -22,12 +22,16 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index a3ef338ee..062d8c394 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -27,12 +27,16 @@ * orientations work. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" |