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

16 files changed, 64 insertions, 0 deletions

diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c
index 8214136e9..e65f8efd2 100644
--- a/lbx/lbxcmap.c
+++ b/lbx/lbxcmap.c
@@ -27,6 +27,10 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.9 2001/08/23 14:46:57 alanh Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/lbx/lbxdata.h b/lbx/lbxdata.h
index 8b5343bfd..b577f6e50 100644
--- a/lbx/lbxdata.h
+++ b/lbx/lbxdata.h
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _LBXDATA_H_
 #define _LBXDATA_H_
 #define NEED_REPLIES
diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c
index d3eb0af46..9b12453b3 100644
--- a/lbx/lbxdix.c
+++ b/lbx/lbxdix.c
@@ -50,6 +50,10 @@ in this Software without prior written authorization from The Open Group.
 
 /* various bits of DIX-level mangling */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #include <stdio.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c
index 5750ba5b1..2dbd7e9af 100644
--- a/lbx/lbxexts.c
+++ b/lbx/lbxexts.c
@@ -23,6 +23,10 @@
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes 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/lbx/lbxgfx.c b/lbx/lbxgfx.c
index f1c1623b0..877ce8e05 100644
--- a/lbx/lbxgfx.c
+++ b/lbx/lbxgfx.c
@@ -25,6 +25,10 @@
 
 /* various bits of DIX-level mangling */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #include <stdio.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c
index 92958fedd..f99e7af05 100644
--- a/lbx/lbxmain.c
+++ b/lbx/lbxmain.c
@@ -47,6 +47,10 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.12 2001/10/28 03:34:12 tsi Exp $ */
  
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c
index 619af011a..53f5efed9 100644
--- a/lbx/lbxopts.c
+++ b/lbx/lbxopts.c
@@ -23,6 +23,10 @@
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.5 2001/01/17 22:37:00 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef OPTDEBUG
 #include <stdio.h>
 #endif
diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c
index c76235313..09d818f0c 100644
--- a/lbx/lbxprop.c
+++ b/lbx/lbxprop.c
@@ -50,6 +50,10 @@ in this Software without prior written authorization from The Open Group.
 
 /* various bits of DIX-level mangling */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #include <stdio.h>
 #define NEED_REPLIES
diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h
index ed82f5aee..195e985b3 100644
--- a/lbx/lbxserve.h
+++ b/lbx/lbxserve.h
@@ -47,6 +47,10 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _LBXSERVE_H_
 
 #include "colormap.h"
diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c
index 450364766..65c66e717 100644
--- a/lbx/lbxsquish.c
+++ b/lbx/lbxsquish.c
@@ -49,6 +49,10 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes 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/Xos.h>
diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h
index 8b0420452..9cf3d7630 100644
--- a/lbx/lbxsrvopts.h
+++ b/lbx/lbxsrvopts.h
@@ -23,6 +23,10 @@
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _LBX_SRVOPTS_H_
 #define _LBX_SRVOPTS_H_
 
diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c
index 4c571fec9..cfed6a4c5 100644
--- a/lbx/lbxswap.c
+++ b/lbx/lbxswap.c
@@ -47,6 +47,10 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/lbx/lbxtables.c b/lbx/lbxtables.c
index 26a635f6f..5e8174eeb 100644
--- a/lbx/lbxtables.c
+++ b/lbx/lbxtables.c
@@ -22,6 +22,10 @@
  *
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "dix.h"
 
 extern int ProcInitialConnection(ClientPtr client);
diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c
index 3fb654e38..10a7ca4bb 100644
--- a/lbx/lbxtags.c
+++ b/lbx/lbxtags.c
@@ -48,6 +48,10 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/misc.h>
 #include "lbxdata.h"
diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h
index aef093448..8577bd93c 100644
--- a/lbx/lbxtags.h
+++ b/lbx/lbxtags.h
@@ -48,6 +48,10 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _LBXTAGS_H_
 #define _LBXTAGS_H_
 #include	"lbxserve.h"
diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c
index 7ca126c25..e376908c0 100644
--- a/lbx/lbxzerorep.c
+++ b/lbx/lbxzerorep.c
@@ -36,6 +36,10 @@ from The Open Group.
  */
 
 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>