diff options
Diffstat (limited to 'fb')
44 files changed, 179 insertions, 3 deletions
@@ -24,6 +24,10 @@ /* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.9 2005/04/20 12:25:19 daniels Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FB_H_ #define _FB_H_ diff --git a/fb/fb24_32.c b/fb/fb24_32.c index 2bdad1f3a..214e2e6dd 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86.h" #include "xf86_ansic.h" diff --git a/fb/fb24_32.h b/fb/fb24_32.h index 74e04a183..3c83f3423 100644 --- a/fb/fb24_32.h +++ b/fb/fb24_32.h @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FB24_32_H_ #define _FB24_32_H_ diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 59d76d333..75b577049 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef FB_SCREEN_PRIVATE diff --git a/fb/fbarc.c b/fb/fbarc.c index d7e0688b1..315aa181c 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "mizerarc.h" #ifdef IN_MODULE diff --git a/fb/fbbits.c b/fb/fbbits.c index a6bcd5b6a..ab67b4cf3 100644 --- a/fb/fbbits.c +++ b/fb/fbbits.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.5 2000/02/17 14:16:22 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "miline.h" #include "mizerarc.h" diff --git a/fb/fbbits.h b/fb/fbbits.h index 69b254452..699782229 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -29,6 +29,10 @@ #define isClipped(c,ul,lr) ((((c) - (ul)) | ((lr) - (c))) & 0x80008000) +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef BITSMUL #define MUL BITSMUL #else diff --git a/fb/fbblt.c b/fb/fbblt.c index b5daf1096..131707dc6 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #define InitializeShifts(sx,dx,ls,rs) { \ diff --git a/fb/fbbltone.c b/fb/fbbltone.c index ca45207b5..59ba3932e 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.11 2001/09/07 15:15:31 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" /* diff --git a/fb/fbbstore.c b/fb/fbbstore.c index c74eaa240..01ec9b7e0 100644 --- a/fb/fbbstore.c +++ b/fb/fbbstore.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.1 1999/11/19 13:53:42 hohndel Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbcmap.c b/fb/fbcmap.c index 4eacd194b..762c51c9d 100644 --- a/fb/fbcmap.c +++ b/fb/fbcmap.c @@ -30,6 +30,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/fb/fbcompose.c b/fb/fbcompose.c index 5b735fcc4..8cb0c86cc 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -24,6 +24,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 9adccd71b..eb295a397 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.13 2003/11/10 18:21:47 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef IN_MODULE #include "xf86_ansic.h" diff --git a/fb/fbedge.c b/fb/fbedge.c index 7a383020b..f3311c6df 100644 --- a/fb/fbedge.c +++ b/fb/fbedge.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/fb/fbedgeimp.h b/fb/fbedgeimp.h index 4a91adc19..136a15e36 100644 --- a/fb/fbedgeimp.h +++ b/fb/fbedgeimp.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef rasterizeSpan #endif diff --git a/fb/fbfill.c b/fb/fbfill.c index 5ab7019ad..3c4959959 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.5 2003/01/29 00:43:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "fbmmx.h" diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index 43b2e6b15..2a60da165 100644 --- a/fb/fbfillrect.c +++ b/fb/fbfillrect.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index e5e322d85..e2bb71e3a 100644 --- a/fb/fbfillsp.c +++ b/fb/fbfillsp.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void @@ -24,6 +24,10 @@ /* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.3 2004/12/04 00:42:50 kuhn Exp $ */ /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef IN_MODULE #include "xf86_ansic.h" diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index de69be3cc..7c58dcb82 100644 --- a/fb/fbgetsp.c +++ b/fb/fbgetsp.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.5 2000/05/06 21:09:33 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbglyph.c b/fb/fbglyph.c index c2a265c12..b97f0c0b3 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -23,8 +23,12 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #define dummyScreen screenInfo.screens[0] diff --git a/fb/fbimage.c b/fb/fbimage.c index 171993a0a..96bd8cf95 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.7 2001/05/29 04:54:09 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef XFree86LOADER #include "xf86.h" diff --git a/fb/fbline.c b/fb/fbline.c index ad684604f..8e99dd99f 100644 --- a/fb/fbline.c +++ b/fb/fbline.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbmmx.c b/fb/fbmmx.c index 9db335b44..d9c3af2ed 100644 --- a/fb/fbmmx.c +++ b/fb/fbmmx.c @@ -26,6 +26,10 @@ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef USE_MMX #include "fb.h" diff --git a/fb/fbmmx.h b/fb/fbmmx.h index 39e8d1e9c..9ec8affd7 100644 --- a/fb/fbmmx.h +++ b/fb/fbmmx.h @@ -22,6 +22,10 @@ * * Based on work by Owen Taylor */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef USE_MMX #ifndef __amd64__ diff --git a/fb/fboverlay.c b/fb/fboverlay.c index c165df9c4..e777d8e06 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -25,6 +25,10 @@ /* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "fboverlay.h" diff --git a/fb/fboverlay.h b/fb/fboverlay.h index e6a4e033f..a0eb8c7c4 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FBOVERLAY_H_ #define _FBOVERLAY_H_ diff --git a/fb/fbpict.c b/fb/fbpict.c index c269b5eae..40dd2853c 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef RENDER diff --git a/fb/fbpict.h b/fb/fbpict.h index 3e751e9f0..35f8ec34e 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FBPICT_H_ #define _FBPICT_H_ diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 482b30f57..1cb34e4d9 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.9 2001/05/29 04:54:09 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef IN_MODULE #include "xf86_ansic.h" diff --git a/fb/fbpoint.c b/fb/fbpoint.c index 4bf345d93..5ba24e0e5 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" typedef void (*FbDots) (FbBits *dst, diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c index 43a9f4ff5..ef40b7073 100644 --- a/fb/fbpseudocolor.c +++ b/fb/fbpseudocolor.c @@ -1,12 +1,16 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "glyphstr.h" #include "resource.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "micmap.h" #include "fb.h" #include "fbpseudocolor.h" diff --git a/fb/fbpseudocolor.h b/fb/fbpseudocolor.h index 64de71db8..c653fbcab 100644 --- a/fb/fbpseudocolor.h +++ b/fb/fbpseudocolor.h @@ -1,3 +1,7 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FB_XX_H_ # define _FB_XX_H_ diff --git a/fb/fbpush.c b/fb/fbpush.c index 09485cfbe..8f1336963 100644 --- a/fb/fbpush.c +++ b/fb/fbpush.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbrop.h b/fb/fbrop.h index 65f62c393..541071b19 100644 --- a/fb/fbrop.h +++ b/fb/fbrop.h @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FBROP_H_ #define _FBROP_H_ diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 750b9e556..804503e12 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" Bool diff --git a/fb/fbseg.c b/fb/fbseg.c index 71474bbd2..18a996e0c 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.7 2001/01/17 07:40:02 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "miline.h" diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index 9e6d1a08f..eefc2da82 100644 --- a/fb/fbsetsp.c +++ b/fb/fbsetsp.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.4 2000/05/06 21:09:34 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbsolid.c b/fb/fbsolid.c index d727e4d01..89effe63b 100644 --- a/fb/fbsolid.c +++ b/fb/fbsolid.c @@ -24,6 +24,10 @@ #define FbSelectPart(xor,o,t) xor +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbstipple.c b/fb/fbstipple.c index 7c9271590..44aa5f331 100644 --- a/fb/fbstipple.c +++ b/fb/fbstipple.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.6 2000/02/23 20:29:47 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifndef FBNOPIXADDR diff --git a/fb/fbtile.c b/fb/fbtile.c index 09bf97f1f..ef3242241 100644 --- a/fb/fbtile.c +++ b/fb/fbtile.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.3 2000/02/12 03:39:43 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" /* diff --git a/fb/fbtrap.c b/fb/fbtrap.c index 09bff0bfd..863969527 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef RENDER diff --git a/fb/fbutil.c b/fb/fbutil.c index e35f0db03..8153ab364 100644 --- a/fb/fbutil.c +++ b/fb/fbutil.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" FbBits diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 4968d29af..8820856b0 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef IN_MODULE #include "xf86_ansic.h" |