diff options
Diffstat (limited to 'iplan2p4')
33 files changed, 134 insertions, 2 deletions
diff --git a/iplan2p4/ipl.h b/iplan2p4/ipl.h index d6cf45b14..356e43367 100644 --- a/iplan2p4/ipl.h +++ b/iplan2p4/ipl.h @@ -32,6 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "pixmap.h" #include "region.h" diff --git a/iplan2p4/iplallpriv.c b/iplan2p4/iplallpriv.c index eadca0a01..23a13dbd1 100644 --- a/iplan2p4/iplallpriv.c +++ b/iplan2p4/iplallpriv.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplbitblt.c b/iplan2p4/iplbitblt.c index 7c157aad6..4bf64437e 100644 --- a/iplan2p4/iplbitblt.c +++ b/iplan2p4/iplbitblt.c @@ -36,6 +36,10 @@ Author: Keith Packard /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#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/iplan2p4/iplblt.c b/iplan2p4/iplblt.c index 850ee5c43..85bcece13 100644 --- a/iplan2p4/iplblt.c +++ b/iplan2p4/iplblt.c @@ -36,6 +36,10 @@ Author: Keith Packard /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#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/iplan2p4/iplbres.c b/iplan2p4/iplbres.c index c3830649e..a9d6966e9 100644 --- a/iplan2p4/iplbres.c +++ b/iplan2p4/iplbres.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "ipl.h" diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c index 7ac7b1cdb..d78ed4b61 100644 --- a/iplan2p4/iplbresd.c +++ b/iplan2p4/iplbresd.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "ipl.h" diff --git a/iplan2p4/iplbstore.c b/iplan2p4/iplbstore.c index 64874a407..d2fc23513 100644 --- a/iplan2p4/iplbstore.c +++ b/iplan2p4/iplbstore.c @@ -16,6 +16,10 @@ * * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef lint static char rcsid[] = "$XConsortium: iplbstore.c,v 5.8 93/12/13 17:21:51 dpw Exp $ SPRITE (Berkeley)"; diff --git a/iplan2p4/iplcmap.c b/iplan2p4/iplcmap.c index a6e8f2184..0f3cdca14 100644 --- a/iplan2p4/iplcmap.c +++ b/iplan2p4/iplcmap.c @@ -32,6 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/iplan2p4/iplfillarc.c b/iplan2p4/iplfillarc.c index 62571114a..f62ff9f9e 100644 --- a/iplan2p4/iplfillarc.c +++ b/iplan2p4/iplfillarc.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "miscstruct.h" diff --git a/iplan2p4/iplfillrct.c b/iplan2p4/iplfillrct.c index 40b9d435c..a3301457b 100644 --- a/iplan2p4/iplfillrct.c +++ b/iplan2p4/iplfillrct.c @@ -34,6 +34,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplfillsp.c b/iplan2p4/iplfillsp.c index 5bf0b0b50..863d369af 100644 --- a/iplan2p4/iplfillsp.c +++ b/iplan2p4/iplfillsp.c @@ -81,6 +81,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplgc.c b/iplan2p4/iplgc.c index 925f34909..1cbcb7522 100644 --- a/iplan2p4/iplgc.c +++ b/iplan2p4/iplgc.c @@ -52,11 +52,15 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ipl.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c index 3478a8051..619c438db 100644 --- a/iplan2p4/iplgetsp.c +++ b/iplan2p4/iplgetsp.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplhrzvert.c b/iplan2p4/iplhrzvert.c index 621b55ba5..45faaa1cb 100644 --- a/iplan2p4/iplhrzvert.c +++ b/iplan2p4/iplhrzvert.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gc.h" diff --git a/iplan2p4/iplimage.c b/iplan2p4/iplimage.c index 644fd3c07..5b72b885f 100644 --- a/iplan2p4/iplimage.c +++ b/iplan2p4/iplimage.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/iplan2p4/iplline.c b/iplan2p4/iplline.c index 19f230e07..19d078cb2 100644 --- a/iplan2p4/iplline.c +++ b/iplan2p4/iplline.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/iplan2p4/iplmap.h b/iplan2p4/iplmap.h index b188ec3ec..cc065aa82 100644 --- a/iplan2p4/iplmap.h +++ b/iplan2p4/iplmap.h @@ -37,6 +37,10 @@ interleaved planes */ /* a losing vendor cpp dumps core if we define NAME in terms of CATNAME */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if INTER_PLANES == 2 #define NAME(subname) ipl2p2##subname #elif INTER_PLANES == 4 diff --git a/iplan2p4/iplmergerop.h b/iplan2p4/iplmergerop.h index bd3736759..09141c983 100644 --- a/iplan2p4/iplmergerop.h +++ b/iplan2p4/iplmergerop.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.0 1996/08/18 01:54:53 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _IPLANMERGEROP_H_ #define _IPLANMERGEROP_H_ diff --git a/iplan2p4/iplmskbits.c b/iplan2p4/iplmskbits.c index d408b804e..e611bd293 100644 --- a/iplan2p4/iplmskbits.c +++ b/iplan2p4/iplmskbits.c @@ -1,6 +1,10 @@ /* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "iplmap.h" unsigned short iplmask[] = diff --git a/iplan2p4/iplmskbits.h b/iplan2p4/iplmskbits.h index 51bb26393..1efc47d44 100644 --- a/iplan2p4/iplmskbits.h +++ b/iplan2p4/iplmskbits.h @@ -42,6 +42,10 @@ extern INTER_PIXGRP iplendpartial[]; _IG(xor) = 0; \ }) +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if INTER_PLANES == 2 #define PLANE_TIMESCONDG(x) \ diff --git a/iplan2p4/iplpixmap.c b/iplan2p4/iplpixmap.c index 9a1e35852..324b161e2 100644 --- a/iplan2p4/iplpixmap.c +++ b/iplan2p4/iplpixmap.c @@ -56,6 +56,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" diff --git a/iplan2p4/iplply1rct.c b/iplan2p4/iplply1rct.c index 6d172a16b..bac2be4ed 100644 --- a/iplan2p4/iplply1rct.c +++ b/iplan2p4/iplply1rct.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/iplan2p4/iplpntwin.c b/iplan2p4/iplpntwin.c index d58d4bb1f..8421ba377 100644 --- a/iplan2p4/iplpntwin.c +++ b/iplan2p4/iplpntwin.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/iplan2p4/iplpolypnt.c b/iplan2p4/iplpolypnt.c index 3bcd48360..61aea7ffd 100644 --- a/iplan2p4/iplpolypnt.c +++ b/iplan2p4/iplpolypnt.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/iplan2p4/iplrrop.c b/iplan2p4/iplrrop.c index dc3bad6a7..1b65fa9dc 100644 --- a/iplan2p4/iplrrop.c +++ b/iplan2p4/iplrrop.c @@ -33,6 +33,10 @@ interleaved planes */ /* ipl reduced rasterop computations */ +#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/iplan2p4/iplrrop.h b/iplan2p4/iplrrop.h index 31e7b79b1..05a88fea4 100644 --- a/iplan2p4/iplrrop.h +++ b/iplan2p4/iplrrop.h @@ -9,6 +9,10 @@ interleaved planes */ #define INTER_RROP_FETCH_GC(gc) \ INTER_RROP_FETCH_GCPRIV(((iplPrivGCPtr)(gc)->devPrivates[iplGCPrivateIndex].ptr)) +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if RROP == GXcopy #define INTER_RROP_DECLARE register unsigned short *rrop_xor; #define INTER_RROP_FETCH_GCPRIV(devPriv) rrop_xor = (devPriv)->xorg; diff --git a/iplan2p4/iplscrinit.c b/iplan2p4/iplscrinit.c index 825d4f9d2..073e7b9a4 100644 --- a/iplan2p4/iplscrinit.c +++ b/iplan2p4/iplscrinit.c @@ -32,6 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c index 7ad378747..e64dbf4e4 100644 --- a/iplan2p4/iplsetsp.c +++ b/iplan2p4/iplsetsp.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplsolid.c b/iplan2p4/iplsolid.c index 7875f7903..768bf0ace 100644 --- a/iplan2p4/iplsolid.c +++ b/iplan2p4/iplsolid.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/ipltegblt.c b/iplan2p4/ipltegblt.c index 167bc25a1..9a46e31c6 100644 --- a/iplan2p4/ipltegblt.c +++ b/iplan2p4/ipltegblt.c @@ -51,11 +51,15 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ipl.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/iplan2p4/ipltile32.c b/iplan2p4/ipltile32.c index 5a5e04080..06be5a2e8 100644 --- a/iplan2p4/ipltile32.c +++ b/iplan2p4/ipltile32.c @@ -35,6 +35,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/ipltileodd.c b/iplan2p4/ipltileodd.c index 32ffadbe4..7230a5621 100644 --- a/iplan2p4/ipltileodd.c +++ b/iplan2p4/ipltileodd.c @@ -35,6 +35,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplwindow.c b/iplan2p4/iplwindow.c index c8cd4c133..511e753b3 100644 --- a/iplan2p4/iplwindow.c +++ b/iplan2p4/iplwindow.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" |