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>.

40 files changed, 160 insertions, 0 deletions

diff --git a/Xext/EVI.c b/Xext/EVI.c
index f4f0eea1f..b59180685 100644
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "dixstruct.h"
diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h
index db5655f97..857e7565a 100644
--- a/Xext/EVIstruct.h
+++ b/Xext/EVIstruct.h
@@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef EVI_STRUCT_H
 #define EVI_STRUCT_H
 
diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index b8fb4420a..bd2d2f8d9 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -28,6 +28,10 @@ from The Open Group.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 65b25a909..8b08ba5dc 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -29,6 +29,10 @@ from The Open Group.
 /* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */
 
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/cup.c b/Xext/cup.c
index 55b2930c1..1ce2885b7 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/dpms.c b/Xext/dpms.c
index 093410336..5739da6a2 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -35,6 +35,10 @@ Equipment Corporation.
 
 /* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h
index 36ad391da..ae1e6e25a 100644
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@@ -2,6 +2,10 @@
 
 /* Prototypes for functions that the DDX must provide */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _DPMSPROC_H_
 #define _DPMSPROC_H_
 
diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c
index 24086084a..128c57bb0 100644
--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@@ -30,6 +30,10 @@ Equipment Corporation.
 
 typedef int Bool;
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "dpmsproc.h"
 
 #define FALSE 0
diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index b49a0d417..57f788954 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -33,6 +33,10 @@
 
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index be520b0f8..51cc91a27 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "window.h"
diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c
index 10550dc37..7af856b98 100644
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c
index 1a96d0097..297614e43 100644
--- a/Xext/mbufpx.c
+++ b/Xext/mbufpx.c
@@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: mbufpx.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index e32642b28..18c58ab8f 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -30,6 +30,10 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index f2a8a7cd5..1fa8756e2 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -26,6 +26,10 @@ Equipment Corporation.
 /* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */
 
 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index c4faa5a9a..6cbb94dd3 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -36,6 +36,10 @@ Equipment Corporation.
  *	PanoramiX definitions
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index d86b744cd..51b816695 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -25,6 +25,10 @@ Equipment Corporation.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 5a3060839..0b6183c42 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -28,6 +28,10 @@ Equipment Corporation.
 
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #define NEED_REPLIES
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index 92800062e..dc3b3d805 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _PANORAMIXSRV_H_
 #define _PANORAMIXSRV_H_
 
diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
index a3d137619..67caa5613 100644
--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86$ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "dixstruct.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index 0597bea9f..53ce7e4bc 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -32,6 +32,10 @@ in this Software without prior written authorization from the X Consortium.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/security.c b/Xext/security.c
index 75ca16765..767055cc5 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "windowstr.h"
diff --git a/Xext/shape.c b/Xext/shape.c
index bf07eb180..81861186a 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/shm.c b/Xext/shm.c
index de791c8bd..751d51fbe 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group.
 
 #define SHM
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #ifndef Lynx
 #include <sys/ipc.h>
diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c
index ce925adc5..b30f7fd8e 100644
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
 
 /* dixsleep.c - implement millisecond timeouts for X clients */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "sleepuntil.h"
 #include <X11/X.h>
 #include <X11/Xmd.h>
diff --git a/Xext/sleepuntil.h b/Xext/sleepuntil.h
index f8fcc6cb9..0b99148a4 100644
--- a/Xext/sleepuntil.h
+++ b/Xext/sleepuntil.h
@@ -25,6 +25,10 @@
  * XFree86 Project.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _SLEEPUNTIL_H_
 #define _SLEEPUNTIL_H_ 1
 
diff --git a/Xext/sync.c b/Xext/sync.c
index 110ce206a..0d69c02bd 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -54,6 +54,10 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xmd.h>
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index dbd9496d7..ee3af3f72 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -30,6 +30,10 @@ from The Open Group.
 
 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/xevie.c b/Xext/xevie.c
index d33f027a9..300f3c9f4 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -34,6 +34,10 @@ of the copyright holder.
 
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c
index 761483441..145596782 100644
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@@ -35,6 +35,10 @@
  * XLoadQueryFont).
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #ifdef HAS_SHM
 #if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
diff --git a/Xext/xprint.c b/Xext/xprint.c
index 965374fe1..86e74bee3 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -67,6 +67,10 @@ copyright holders.
 /* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */
 
 #define _XP_PRINT_SERVER_
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xos.h>
 #define NEED_EVENTS
diff --git a/Xext/xres.c b/Xext/xres.c
index 7a8fa50b4..1d3105a28 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -6,6 +6,10 @@
 
 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/xtest.c b/Xext/xtest.c
index e9876b2b8..965f0845b 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -29,6 +29,10 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi 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/Xext/xtest1dd.c b/Xext/xtest1dd.c
index 1681d6c50..c232715ba 100644
--- a/Xext/xtest1dd.c
+++ b/Xext/xtest1dd.c
@@ -61,6 +61,10 @@ University of California.
 #define	NEED_EVENTS
 #define	NEED_REPLIES
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/Xos.h>
 #include <X11/X.h>
diff --git a/Xext/xtest1dd.h b/Xext/xtest1dd.h
index 60663dfb9..3130c7075 100644
--- a/Xext/xtest1dd.h
+++ b/Xext/xtest1dd.h
@@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef XTEST1DD_H
 #define XTEST1DD_H 1
 
diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c
index cb8c86aae..bc35d0590 100644
--- a/Xext/xtest1di.c
+++ b/Xext/xtest1di.c
@@ -62,6 +62,10 @@ University of California.
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index bf18e4587..709b75ca7 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -48,6 +48,10 @@ SOFTWARE.
 **
 */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 99d918406..c2dfc7c82 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -23,6 +23,10 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef XVDIX_H
 #define XVDIX_H
 /*
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index e6c644407..36046f89b 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -75,6 +75,10 @@ SOFTWARE.
 **
 */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 05424fe02..65211faa0 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -2,6 +2,10 @@
 
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index c7eba30ad..77af41d41 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _XVMC_H
 #define _XVMC_H
 #include <X11/extensions/Xv.h>