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>.
2026-10-19 00:51:16 +00:00 · 2005-07-03 07:02:09 +00:00 · 2005-07-03 07:02:09 +00:00 · e03198972c
commit e03198972c
parent b8aef6c474
1248 changed files with 5220 additions and 183 deletions
--- 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"
--- 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"
--- 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>
--- 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>
--- 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"
--- 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"
--- 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)";
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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_

--- 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[] =
--- 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)					\
--- 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"
--- 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"
--- 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"
--- 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"
--- 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>
--- 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;
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"