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

25 files changed, 105 insertions, 5 deletions

diff --git a/dix/atom.c b/dix/atom.c
index e337bfcd3..fbfa60716 100644
--- a/dix/atom.c
+++ b/dix/atom.c
@@ -48,6 +48,10 @@ SOFTWARE.
 
 /* $Xorg: atom.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/misc.h>
diff --git a/dix/colormap.c b/dix/colormap.c
index d64b9db23..5d2d40f28 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -49,6 +49,10 @@ SOFTWARE.
 
 /* $Xorg: colormap.c,v 1.4 2001/02/09 02:04:39 xorgcvs 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/dix/cursor.c b/dix/cursor.c
index 11b4629cf..f4d6c6419 100644
--- a/dix/cursor.c
+++ b/dix/cursor.c
@@ -49,6 +49,10 @@ SOFTWARE.
 
 /* $Xorg: cursor.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "servermd.h"
diff --git a/dix/devices.c b/dix/devices.c
index 82dabcf0f..97ad3af37 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -50,6 +50,10 @@ SOFTWARE.
 /* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */
 /* $XdotOrg: xc/programs/Xserver/dix/devices.c,v 1.5 2005/05/22 01:12:49 alanc Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/misc.h>
 #include "resource.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 09445e038..0fed6a0e7 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -78,13 +78,17 @@ Equipment Corporation.
 
 /* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef PANORAMIX_DEBUG
 #include <stdio.h>
 int ProcInitialConnection();
 #endif
 
 #include "windowstr.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "gcstruct.h"
 #include "selection.h"
diff --git a/dix/dispatch.h b/dix/dispatch.h
index ba43bdca2..89ea2dd7e 100644
--- a/dix/dispatch.h
+++ b/dix/dispatch.h
@@ -30,6 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * extension.c, property.c. 
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef DISPATCH_H
 #define DISPATCH_H 1
 
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index cbdd044e4..5d11480f5 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -52,6 +52,10 @@ Equipment Corporation.
 /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
 
 #define NEED_REPLIES
+#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/dix/dixutils.c b/dix/dixutils.c
index ac5636f93..7ce248959 100644
--- a/dix/dixutils.c
+++ b/dix/dixutils.c
@@ -84,6 +84,10 @@ Author:  Adobe Systems Incorporated
 
 /* $Xorg: dixutils.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/misc.h>
diff --git a/dix/events.c b/dix/events.c
index aea54187d..7db0d81e6 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -111,6 +111,10 @@ of the copyright holder.
 
 /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/misc.h>
 #include "resource.h"
diff --git a/dix/extension.c b/dix/extension.c
index f65565df2..a3f83291c 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -47,6 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: extension.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
diff --git a/dix/gc.c b/dix/gc.c
index 743d6e674..dce737cf2 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -48,6 +48,10 @@ SOFTWARE.
 
 /* $Xorg: gc.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#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/dix/globals.c b/dix/globals.c
index 3c15c5a0a..67267eda1 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -49,6 +49,10 @@ SOFTWARE.
 
 /* $Xorg: globals.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/misc.h>
diff --git a/dix/glyphcurs.c b/dix/glyphcurs.c
index 5499cabc5..20c7ba2a3 100644
--- a/dix/glyphcurs.c
+++ b/dix/glyphcurs.c
@@ -47,8 +47,12 @@ SOFTWARE.
 
 /* $Xorg: glyphcurs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/misc.h>
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "scrnintstr.h"
 #include "gcstruct.h"
diff --git a/dix/grabs.c b/dix/grabs.c
index 5887d2aab..d3f88294d 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -48,6 +48,10 @@ SOFTWARE.
 */
 /* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/misc.h>
 #define NEED_EVENTS
diff --git a/dix/initatoms.c b/dix/initatoms.c
index 96b758b77..d25c20d70 100644
--- a/dix/initatoms.c
+++ b/dix/initatoms.c
@@ -3,6 +3,10 @@
  * Do not change!  Changing this file implies a protocol change!
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xatom.h>
 #include <X11/misc.h>
diff --git a/dix/main.c b/dix/main.c
index a8e4f05a4..f047e790a 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -80,6 +80,10 @@ Equipment Corporation.
 /* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */
 
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xos.h>   /* for unistd.h  */
 #include <X11/Xproto.h>
@@ -94,7 +98,7 @@ Equipment Corporation.
 #include "colormap.h"
 #include "colormapst.h"
 #include "cursorstr.h"
-#include "font.h"
+#include <X11/fonts/font.h>
 #include "opaque.h"
 #include "servermd.h"
 #include "site.h"
diff --git a/dix/pixmap.c b/dix/pixmap.c
index eef23673f..e77ddaf66 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -28,6 +28,10 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include <X11/misc.h>
diff --git a/dix/privates.c b/dix/privates.c
index 905fe3d50..1b384d080 100644
--- a/dix/privates.c
+++ b/dix/privates.c
@@ -29,6 +29,10 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include "scrnintstr.h"
 #include <X11/misc.h>
diff --git a/dix/property.c b/dix/property.c
index dec5a91d8..cabe46ecc 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -47,6 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: property.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
diff --git a/dix/resource.c b/dix/resource.c
index 9f3794bd3..62481d0c1 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -102,6 +102,10 @@ Equipment Corporation.
 /* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */
 
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/misc.h>
 #include <X11/os.h>
diff --git a/dix/swaprep.c b/dix/swaprep.c
index 5d1284c08..b424ffcfa 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -48,13 +48,17 @@ SOFTWARE.
 
 /* $Xorg: swaprep.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
 #include <X11/Xproto.h>
 #include <X11/misc.h>
 #include "dixstruct.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "scrnintstr.h"
 #include "swaprep.h"
 #include "globals.h"
diff --git a/dix/swapreq.c b/dix/swapreq.c
index 2e8acaee9..ec19cf2a6 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -48,6 +48,10 @@ SOFTWARE.
 
 /* $Xorg: swapreq.c,v 1.4 2001/02/09 02:04:41 xorgcvs 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/dix/tables.c b/dix/tables.c
index 092abd61f..5196f0e85 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -47,6 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: tables.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_EVENTS
 #define NEED_REPLIES
diff --git a/dix/window.c b/dix/window.c
index 858d65089..dba641d4a 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -80,6 +80,10 @@ Equipment Corporation.
 
 /* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/misc.h>
 #include "scrnintstr.h"
 #include <X11/os.h>
diff --git a/dix/xpstubs.c b/dix/xpstubs.c
index 5f69e6119..09338eb92 100644
--- a/dix/xpstubs.c
+++ b/dix/xpstubs.c
@@ -27,8 +27,12 @@ from The Open Group.
 
 /* $Xorg: xpstubs.c,v 1.5 2001/03/08 17:52:08 pookie Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/misc.h>
-#include "font.h"
+#include <X11/fonts/font.h>
 #ifdef XPRINT
 #include "DiPrint.h"
 #endif