diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
| commit | e03198972ca78b03ad13cb49112c03a052bb763b (patch) | |
| tree | 1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /mi | |
| parent | b8aef6c474ffc6d637bec178674898ea95ccde47 (diff) | |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
Diffstat (limited to 'mi')
54 files changed, 222 insertions, 6 deletions
@@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MI_H #define MI_H #include <X11/X.h> @@ -54,7 +58,7 @@ SOFTWARE. #include "validate.h" #include "window.h" #include "gc.h" -#include "font.h" +#include <X11/fonts/font.h> #include "input.h" #include "cursor.h" diff --git a/mi/miarc.c b/mi/miarc.c index 0ab98d54e..a1057788d 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -50,6 +50,10 @@ SOFTWARE. /* Author: Keith Packard and Bob Scheifler */ /* Warning: this code is toxic, do not dally very long here. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ || (defined(sun) && defined(__SVR4)) #include <math.h> diff --git a/mi/mibank.c b/mi/mibank.c index 1f1087b88..b09f9fd7c 100644 --- a/mi/mibank.c +++ b/mi/mibank.c @@ -77,6 +77,10 @@ /* #define NO_ALLOCA 1 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "servermd.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mi/mibank.h b/mi/mibank.h index cf27d1fae..fb44ccc9b 100644 --- a/mi/mibank.h +++ b/mi/mibank.h @@ -22,6 +22,10 @@ /* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.10 2003/01/01 19:16:42 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __MIBANK_H__ #define __MIBANK_H__ 1 diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 58a59c826..fe60b59ba 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: mibitblt.c,v 1.5 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Author: Todd Newman (aided and abetted by Mr. Drewry) */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/mi/mibstore.c b/mi/mibstore.c index 7be84ef82..6db860d72 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -45,6 +45,10 @@ implied warranty. /* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> @@ -54,7 +58,7 @@ implied warranty. #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "dixstruct.h" /* For requestingClient */ #include "mi.h" diff --git a/mi/mibstore.h b/mi/mibstore.h index fb58975c6..366757f76 100644 --- a/mi/mibstore.h +++ b/mi/mibstore.h @@ -18,6 +18,10 @@ /* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MIBSTORE_H #define _MIBSTORE_H diff --git a/mi/mibstorest.h b/mi/mibstorest.h index fec3c9712..787b9d4f4 100644 --- a/mi/mibstorest.h +++ b/mi/mibstorest.h @@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mibstore.h" #include "regionstr.h" diff --git a/mi/miclipn.c b/mi/miclipn.c index e9f43ab2a..14ff0d69a 100644 --- a/mi/miclipn.c +++ b/mi/miclipn.c @@ -28,6 +28,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "scrnintstr.h" diff --git a/mi/micmap.c b/mi/micmap.c index 1f3c67dae..98f3e521d 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -36,6 +36,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/mi/micmap.h b/mi/micmap.h index ca2a417be..df5f6dc9a 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "colormapst.h" #ifndef _MICMAP_H_ diff --git a/mi/micoord.h b/mi/micoord.h index e4b242475..9521fe0fe 100644 --- a/mi/micoord.h +++ b/mi/micoord.h @@ -26,6 +26,10 @@ * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MICOORD_H_ #define _MICOORD_H_ 1 diff --git a/mi/micursor.c b/mi/micursor.c index 8339e2230..ce5778c37 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: micursor.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "cursor.h" #include <X11/misc.h> diff --git a/mi/midash.c b/mi/midash.c index 0152db7ca..5def4d9c8 100644 --- a/mi/midash.c +++ b/mi/midash.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: midash.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" #include "mistruct.h" #include "mifpoly.h" diff --git a/mi/midispcur.c b/mi/midispcur.c index 2c3cfced4..007ae2519 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -45,6 +45,10 @@ in this Software without prior written authorization from The Open Group. # include "mipointer.h" # include "misprite.h" # include "gcstruct.h" +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef ARGB_CURSOR # include "picturestr.h" #endif diff --git a/mi/miexpose.c b/mi/miexpose.c index 1750de116..fdd2025ec 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -76,6 +76,10 @@ Equipment Corporation. /* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_EVENTS #include <X11/Xproto.h> diff --git a/mi/mifillarc.c b/mi/mifillarc.c index d49ae1d92..0dcf25d05 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -29,6 +29,10 @@ Author: Bob Scheifler, MIT X Consortium /* $Xorg: mifillarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <math.h> #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/mi/mifillarc.h b/mi/mifillarc.h index ff39bac1d..52ea00272 100644 --- a/mi/mifillarc.h +++ b/mi/mifillarc.h @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mifillarc.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __MIFILLARC_H__ #define __MIFILLARC_H__ diff --git a/mi/mifillrct.c b/mi/mifillrct.c index efaadae59..06d448f9e 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mifillrct.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "gcstruct.h" diff --git a/mi/mifpoly.h b/mi/mifpoly.h index 79f606b4d..a1521c656 100644 --- a/mi/mifpoly.h +++ b/mi/mifpoly.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.3 2001/10/25 12:03:47 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index d659c7967..40b83586f 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mifpolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <math.h> #include <X11/X.h> #include "gcstruct.h" @@ -29,6 +29,10 @@ from The Open Group. /* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.8 2001/08/06 20:51:18 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mi/miglblt.c b/mi/miglblt.c index b1ae60250..12d0aa932 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -48,11 +48,15 @@ SOFTWARE. /* $Xorg: miglblt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "misc.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mi/miinitext.c b/mi/miinitext.c index 12d6ddbde..48e533805 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: miinitext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/misc.h> #include "extension.h" #include "micmap.h" diff --git a/mi/miline.h b/mi/miline.h index f52a51ebd..a856038f5 100644 --- a/mi/miline.h +++ b/mi/miline.h @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MILINE_H #include "screenint.h" diff --git a/mi/mioverlay.c b/mi/mioverlay.c index dfdfdecd7..545927b53 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "validate.h" diff --git a/mi/mioverlay.h b/mi/mioverlay.h index 64045f45c..a1d1e1a18 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.3 2000/02/29 00:16:03 mvojkovi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __MIOVERLAY_H #define __MIOVERLAY_H diff --git a/mi/mipointer.c b/mi/mipointer.c index 85474f692..db6f8bce9 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -527,6 +527,10 @@ _miRegisterPointerDevice (pScreen, pDevice) } /* obsolete: for binary compatibility */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef miRegisterPointerDevice #undef miRegisterPointerDevice void diff --git a/mi/mipointer.h b/mi/mipointer.h index f8e7fd084..747954893 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MIPOINTER_H #define MIPOINTER_H diff --git a/mi/mipointrst.h b/mi/mipointrst.h index 682f8ac88..b4dd2f604 100644 --- a/mi/mipointrst.h +++ b/mi/mipointrst.h @@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mipointer.h" #include "scrnintstr.h" diff --git a/mi/mipoly.c b/mi/mipoly.c index 138552d14..403d3da56 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -56,6 +56,10 @@ SOFTWARE. * to the appropriate routine to actually scan convert the * polygon. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "gcstruct.h" diff --git a/mi/mipolycon.c b/mi/mipolycon.c index de33045ef..10c43a78e 100644 --- a/mi/mipolycon.c +++ b/mi/mipolycon.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "pixmap.h" #include "mi.h" diff --git a/mi/mipolygen.c b/mi/mipolygen.c index d63dfaec2..c3d9ef397 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolygen.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "miscanfill.h" diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index eec246df5..5d615c28d 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolypnt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "pixmapstr.h" diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 6976f7d3c..6740ea8f6 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolyrect.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index bb9259450..dcf3d815a 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolyseg.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" diff --git a/mi/mipolytext.c b/mi/mipolytext.c index d36fbd22a..c2bbaba38 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -55,12 +55,16 @@ SOFTWARE. * Date: Thu Feb 5 1987 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "misc.h" #include "gcstruct.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "mi.h" diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c index b59691431..8bb736c94 100644 --- a/mi/mipolyutil.c +++ b/mi/mipolyutil.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolyutil.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" #include "gc.h" #include "miscanfill.h" diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 49409a247..5fce1cae7 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" diff --git a/mi/miregion.c b/mi/miregion.c index ddb59fc2d..df3324865 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -77,6 +77,10 @@ Equipment Corporation. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" #include <X11/Xprotostr.h> #include "gc.h" diff --git a/mi/miscanfill.h b/mi/miscanfill.h index 06baee399..49058c1c9 100644 --- a/mi/miscanfill.h +++ b/mi/miscanfill.h @@ -28,6 +28,10 @@ from The Open Group. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SCANFILLINCLUDED #define SCANFILLINCLUDED /* diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 2bb58b54a..b6d8c3dbd 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -28,6 +28,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "servermd.h" #include <X11/misc.h> diff --git a/mi/mispans.c b/mi/mispans.c index 6885af2be..c0b40b8da 100644 --- a/mi/mispans.c +++ b/mi/mispans.c @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: mispans.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/misc.h> #include "pixmapstr.h" #include "gcstruct.h" diff --git a/mi/misprite.c b/mi/misprite.c index 64fd04eb5..6c1ed1bb3 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group. # include "input.h" # include "mi.h" # include "cursorstr.h" -# include "font.h" +# include <X11/fonts/font.h> # include "scrnintstr.h" # include "colormapst.h" # include "windowstr.h" @@ -47,7 +47,11 @@ in this Software without prior written authorization from The Open Group. # include "mipointer.h" # include "mispritest.h" # include "dixfontstr.h" -# include "fontstruct.h" +# include <X11/fonts/fontstruct.h> +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef RENDER # include "mipict.h" #endif diff --git a/mi/mispritest.h b/mi/mispritest.h index 7312d2476..dca1fa619 100644 --- a/mi/mispritest.h +++ b/mi/mispritest.h @@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.4 2001/01/17 22:37:07 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MISPRITEST_H_ #define _MISPRITEST_H_ diff --git a/mi/mistruct.h b/mi/mistruct.h index 98879b72d..36a810703 100644 --- a/mi/mistruct.h +++ b/mi/mistruct.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MISTRUCT_H #define MISTRUCT_H diff --git a/mi/mivalidate.h b/mi/mivalidate.h index c25e5d5bc..612b67e1d 100644 --- a/mi/mivalidate.h +++ b/mi/mivalidate.h @@ -29,6 +29,10 @@ from The Open Group. /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MIVALIDATE_H #define MIVALIDATE_H diff --git a/mi/mivaltree.c b/mi/mivaltree.c index d9e711777..6a7d6030c 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -92,6 +92,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/mi/miwideline.c b/mi/miwideline.c index 606ccd43a..44cf18f2e 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -35,6 +35,10 @@ from The Open Group. * bresenham zero-width lines, except walks an X edge */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #ifdef _XOPEN_SOURCE #include <math.h> diff --git a/mi/miwideline.h b/mi/miwideline.h index 96d6aae86..cdfe624db 100644 --- a/mi/miwideline.h +++ b/mi/miwideline.h @@ -30,6 +30,10 @@ from The Open Group. /* Author: Keith Packard, MIT X Consortium */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mispans.h" #include "mifpoly.h" /* for ICEIL */ diff --git a/mi/miwindow.c b/mi/miwindow.c index 1ebb0cee2..280d0f8eb 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: miwindow.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "regionstr.h" #include "region.h" diff --git a/mi/mizerarc.c b/mi/mizerarc.c index 282bf6df8..62402f41b 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -35,6 +35,10 @@ Author: Bob Scheifler, MIT X Consortium * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <math.h> #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/mi/mizerclip.c b/mi/mizerclip.c index 1315fd244..9c9a07e6d 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -45,6 +45,10 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> diff --git a/mi/mizerline.c b/mi/mizerline.c index ad9e17b46..c88b62e81 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> |