diff options
Diffstat (limited to 'mfb')
-rw-r--r-- | mfb/fastblt.h | 4 | ||||
-rw-r--r-- | mfb/maskbits.c | 4 | ||||
-rw-r--r-- | mfb/maskbits.h | 4 | ||||
-rw-r--r-- | mfb/mergerop.h | 4 | ||||
-rw-r--r-- | mfb/mfb.h | 4 | ||||
-rw-r--r-- | mfb/mfbbitblt.c | 4 | ||||
-rw-r--r-- | mfb/mfbblt.c | 4 | ||||
-rw-r--r-- | mfb/mfbbres.c | 4 | ||||
-rw-r--r-- | mfb/mfbbresd.c | 4 | ||||
-rw-r--r-- | mfb/mfbbstore.c | 4 | ||||
-rw-r--r-- | mfb/mfbclip.c | 4 | ||||
-rw-r--r-- | mfb/mfbcmap.c | 4 | ||||
-rw-r--r-- | mfb/mfbfillarc.c | 4 | ||||
-rw-r--r-- | mfb/mfbfillrct.c | 4 | ||||
-rw-r--r-- | mfb/mfbfillsp.c | 4 | ||||
-rw-r--r-- | mfb/mfbfont.c | 6 | ||||
-rw-r--r-- | mfb/mfbgc.c | 6 | ||||
-rw-r--r-- | mfb/mfbgetsp.c | 4 | ||||
-rw-r--r-- | mfb/mfbhrzvert.c | 4 | ||||
-rw-r--r-- | mfb/mfbimage.c | 4 | ||||
-rw-r--r-- | mfb/mfbimggblt.c | 6 | ||||
-rw-r--r-- | mfb/mfbline.c | 4 | ||||
-rw-r--r-- | mfb/mfbmisc.c | 4 | ||||
-rw-r--r-- | mfb/mfbpixmap.c | 4 | ||||
-rw-r--r-- | mfb/mfbply1rct.c | 4 | ||||
-rw-r--r-- | mfb/mfbplygblt.c | 6 | ||||
-rw-r--r-- | mfb/mfbpntarea.c | 4 | ||||
-rw-r--r-- | mfb/mfbpntwin.c | 4 | ||||
-rw-r--r-- | mfb/mfbpolypnt.c | 4 | ||||
-rw-r--r-- | mfb/mfbpushpxl.c | 4 | ||||
-rw-r--r-- | mfb/mfbscrclse.c | 4 | ||||
-rw-r--r-- | mfb/mfbscrinit.c | 4 | ||||
-rw-r--r-- | mfb/mfbsetsp.c | 4 | ||||
-rw-r--r-- | mfb/mfbtegblt.c | 6 | ||||
-rw-r--r-- | mfb/mfbtile.c | 4 | ||||
-rw-r--r-- | mfb/mfbwindow.c | 4 | ||||
-rw-r--r-- | mfb/mfbzerarc.c | 4 |
37 files changed, 153 insertions, 5 deletions
diff --git a/mfb/fastblt.h b/mfb/fastblt.h index f25541f55..08846a41f 100644 --- a/mfb/fastblt.h +++ b/mfb/fastblt.h @@ -47,6 +47,10 @@ from The Open Group. #define SwitchEven(n) case n: BodyEven(n) /* to allow mfb and cfb to share code... */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef BitRight #define BitRight(a,b) SCRRIGHT(a,b) #define BitLeft(a,b) SCRLEFT(a,b) diff --git a/mfb/maskbits.c b/mfb/maskbits.c index 0264dd45b..d2a90962d 100644 --- a/mfb/maskbits.c +++ b/mfb/maskbits.c @@ -50,6 +50,10 @@ SOFTWARE. */ /* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.5 2001/01/17 22:37:01 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "maskbits.h" #include "servermd.h" diff --git a/mfb/maskbits.h b/mfb/maskbits.h index fa5ffca4d..ed5cc2687 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -24,6 +24,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: maskbits.h,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/mfb/mergerop.h b/mfb/mergerop.h index ba699466c..c8652eb81 100644 --- a/mfb/mergerop.h +++ b/mfb/mergerop.h @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.13 2001/10/28 03:34:13 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MERGEROP_H_ #define _MERGEROP_H_ @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfb.h,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if !defined(_MFB_H_) || defined(MFB_PROTOTYPES_ONLY) #ifndef MFB_PROTOTYPES_ONLY #define _MFB_H_ diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index c10f4f988..70e2a9934 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbitblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index 6aff98cac..ce77fe22c 100644 --- a/mfb/mfbblt.c +++ b/mfb/mfbblt.c @@ -32,6 +32,10 @@ Author: Keith Packard */ /* $Xorg: mfbblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index 21d867d1c..b16569804 100644 --- a/mfb/mfbbres.c +++ b/mfb/mfbbres.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbres.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "mfb.h" diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index fa3b43462..0c4a058d4 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbresd.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "mfb.h" diff --git a/mfb/mfbbstore.c b/mfb/mfbbstore.c index d30c67ae7..270aa78fd 100644 --- a/mfb/mfbbstore.c +++ b/mfb/mfbbstore.c @@ -28,6 +28,10 @@ from The Open Group. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mfb.h" #include <X11/X.h> #include "mibstore.h" diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index 32e1da934..5501f0d5c 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbclip.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "regionstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c index 15c73245f..a16964e15 100644 --- a/mfb/mfbcmap.c +++ b/mfb/mfbcmap.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbcmap.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "colormapst.h" diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index 4e1e0623d..a5442896f 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mfbfillarc.c,v 1.4 2001/02/09 02:05:18 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/mfb/mfbfillrct.c b/mfb/mfbfillrct.c index 13f57e000..ba8a14283 100644 --- a/mfb/mfbfillrct.c +++ b/mfb/mfbfillrct.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbfillrct.c,v 1.4 2001/02/09 02:05:18 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/mfb/mfbfillsp.c b/mfb/mfbfillsp.c index 6c3a2b506..f75ccb18d 100644 --- a/mfb/mfbfillsp.c +++ b/mfb/mfbfillsp.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbfillsp.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "gcstruct.h" diff --git a/mfb/mfbfont.c b/mfb/mfbfont.c index e4ec62cbc..3798cd22b 100644 --- a/mfb/mfbfont.c +++ b/mfb/mfbfont.c @@ -45,11 +45,15 @@ SOFTWARE. */ /* $Xorg: mfbfont.c,v 1.4 2001/02/09 02:05:18 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 "mfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index 2f46dced7..c9ff20a45 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -46,12 +46,16 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbgc.c,v 1.4 2001/02/09 02:05:19 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 "mfb.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index bec9fc641..fd6bbeb8d 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbgetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c index a8f25f127..9a9d20dac 100644 --- a/mfb/mfbhrzvert.c +++ b/mfb/mfbhrzvert.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbhrzvert.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gc.h" diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index b305a2cd4..299905701 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbimage.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index 5f86b4cb5..0c0d4140c 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -47,11 +47,15 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbimggblt.c,v 1.4 2001/02/09 02:05:19 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 "mfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbline.c b/mfb/mfbline.c index c30deedc7..af7c27874 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbline.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/mfb/mfbmisc.c b/mfb/mfbmisc.c index d53dc2f73..98db7c1da 100644 --- a/mfb/mfbmisc.c +++ b/mfb/mfbmisc.c @@ -45,6 +45,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbmisc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "cursor.h" diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c index 36055643d..c3d5d5ea6 100644 --- a/mfb/mfbpixmap.c +++ b/mfb/mfbpixmap.c @@ -52,6 +52,10 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index 6c2af609a..9b783f609 100644 --- a/mfb/mfbply1rct.c +++ b/mfb/mfbply1rct.c @@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index e8bb8cbce..275e8c646 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -47,11 +47,15 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbplygblt.c,v 1.4 2001/02/09 02:05:19 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 "mfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbpntarea.c b/mfb/mfbpntarea.c index c9aac2c36..0719e4ebd 100644 --- a/mfb/mfbpntarea.c +++ b/mfb/mfbpntarea.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpntarea.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbpntwin.c b/mfb/mfbpntwin.c index e6dcdfdca..d1c19b691 100644 --- a/mfb/mfbpntwin.c +++ b/mfb/mfbpntwin.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c index e9cbbe36f..e5ac4c874 100644 --- a/mfb/mfbpolypnt.c +++ b/mfb/mfbpolypnt.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpolypnt.c,v 1.4 2001/02/09 02:05:19 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/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index 511d6c22c..1cbdf9a5b 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpushpxl.c,v 1.4 2001/02/09 02:05:19 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/mfb/mfbscrclse.c b/mfb/mfbscrclse.c index 12ccf6079..55445932c 100644 --- a/mfb/mfbscrclse.c +++ b/mfb/mfbscrclse.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.3tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mfb.h" #include "scrnintstr.h" diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index 2e83c9b6e..9defac1df 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbscrinit.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> /* for xColorItem */ #include <X11/Xmd.h> diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index f796fd742..d681bc37b 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbsetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c index 455e44c1b..ac22aee0c 100644 --- a/mfb/mfbtegblt.c +++ b/mfb/mfbtegblt.c @@ -49,11 +49,15 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "mfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index 25a820b9a..ecfa06952 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbtile.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index 1f277e4b4..56f3f468a 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index 54d61bad1..92fd81dfb 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" |