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, 26 insertions, 26 deletions

diff --git a/src/fontfile/bitsource.c b/src/fontfile/bitsource.c
index b487ce4..2039fe7 100644
--- a/src/fontfile/bitsource.c
+++ b/src/fontfile/bitsource.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "fntfilst.h"
+#include <X11/fonts/fntfilst.h>
 
 BitmapSourcesRec	FontFileBitmapSources;
 
diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c
index aa2a7a5..a6b20e7 100644
--- a/src/fontfile/bufio.c
+++ b/src/fontfile/bufio.c
@@ -35,8 +35,8 @@ from The Open Group.
 
 
 #include <X11/Xos.h>
-#include <fontmisc.h>
-#include <bufio.h>
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/bufio.h>
 #include <errno.h>
 
 BufFilePtr
diff --git a/src/fontfile/decompress.c b/src/fontfile/decompress.c
index d35f5a6..ca552a1 100644
--- a/src/fontfile/decompress.c
+++ b/src/fontfile/decompress.c
@@ -50,8 +50,8 @@ in this Software without prior written authorization from The Open Group.
  * decompress - cat a compressed file
  */
 
-#include "fontmisc.h"
-#include <bufio.h>
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/bufio.h>
 
 #define BITS	16
 
diff --git a/src/fontfile/defaults.c b/src/fontfile/defaults.c
index 41b958e..0091571 100644
--- a/src/fontfile/defaults.c
+++ b/src/fontfile/defaults.c
@@ -62,7 +62,7 @@ in this Software without prior written authorization from The Open Group.
 #define DEFAULT_SCAN_UNIT 1
 #endif
 
-#include "fntfilst.h"
+#include <X11/fonts/fntfilst.h>
 
 void
 FontDefaultFormat (int *bit, int *byte, int *glyph, int *scan)
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index e4b42dc..67b1f96 100644
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
  * Read fonts.dir and fonts.alias files
  */
 
-#include "fntfilst.h"
+#include <X11/fonts/fntfilst.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c
index d564f6c..2c2f7ea 100644
--- a/src/fontfile/ffcheck.c
+++ b/src/fontfile/ffcheck.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
 
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
 #ifdef LOADABLEFONTS
-#include "fontmod.h"
+#include <X11/fonts/fontmod.h>
 #endif
 
 /*
diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c
index cdcc853..61151d5 100644
--- a/src/fontfile/fileio.c
+++ b/src/fontfile/fileio.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include <fntfilio.h>
+#include <X11/fonts/fntfilio.h>
 #include <X11/Xos.h>
 #ifndef O_BINARY
 #define O_BINARY O_RDONLY
diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c
index 5deb1a5..7feafe7 100644
--- a/src/fontfile/filewr.c
+++ b/src/fontfile/filewr.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include <fntfilio.h>
+#include <X11/fonts/fntfilio.h>
 #include <X11/Xos.h>
 
 FontFilePtr
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index 455c6c4..c20cda6 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.2 2004/04/23 18:44:21 eich Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.3 2004/11/15 15:06:55 ago Exp $ */
 /* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
 
 /*
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include    "fntfilst.h"
+#include    <X11/fonts/fntfilst.h>
 #include    <X11/keysym.h>
 
 Bool
diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c
index 3e02582..f88ffcb 100644
--- a/src/fontfile/fontencc.c
+++ b/src/fontfile/fontencc.c
@@ -29,7 +29,7 @@ THE SOFTWARE.
    now have different names. */
 
 #include <X11/fonts/fontenc.h>
-#include "fontencc.h"
+#include <X11/fonts/fontencc.h>
 
 extern void ErrorF(const char *f, ...);
 
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index 82c6fd9..33586a4 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.2 2004/04/23 18:44:21 eich Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.3 2004/11/15 15:06:56 ago Exp $ */
 /* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
 
 /*
@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
 
-#include    "fntfilst.h"
+#include    <X11/fonts/fntfilst.h>
 #ifdef WIN32
 #include <ctype.h>
 #endif
diff --git a/src/fontfile/fontscale.c b/src/fontfile/fontscale.c
index 3b7443f..f9c6323 100644
--- a/src/fontfile/fontscale.c
+++ b/src/fontfile/fontscale.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include    "fntfilst.h"
+#include    <X11/fonts/fntfilst.h>
 #ifdef _XOPEN_SOURCE
 #include <math.h>
 #else
diff --git a/src/fontfile/gunzip.c b/src/fontfile/gunzip.c
index bf737a8..9669a8b 100644
--- a/src/fontfile/gunzip.c
+++ b/src/fontfile/gunzip.c
@@ -4,8 +4,8 @@
    intended for inclusion in X11 public releases. */
 /* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.4 2000/09/19 12:46:08 eich Exp $ */
 
-#include "fontmisc.h"
-#include <bufio.h>
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/bufio.h>
 #include <zlib.h>
 
 typedef struct _xzip_buf {
diff --git a/src/fontfile/printerfont.c b/src/fontfile/printerfont.c
index d241d1b..f91052d 100644
--- a/src/fontfile/printerfont.c
+++ b/src/fontfile/printerfont.c
@@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
 
-#include    "fntfilst.h"
+#include    <X11/fonts/fntfilst.h>
 
 /*
  * Map FPE functions to renderer functions
diff --git a/src/fontfile/register.c b/src/fontfile/register.c
index f168d53..eaacdc1 100644
--- a/src/fontfile/register.c
+++ b/src/fontfile/register.c
@@ -33,12 +33,12 @@ in this Software without prior written authorization from The Open Group.
  * end up dragging in code from all the renderers, which is not small.
  */
 
-#include "fontmisc.h"
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
 
 #ifdef LOADABLEFONTS
-#include "fontmod.h"
+#include <X11/fonts/fontmod.h>
 #endif
 
 void
diff --git a/src/fontfile/renderers.c b/src/fontfile/renderers.c
index 7d11d3e..4186724 100644
--- a/src/fontfile/renderers.c
+++ b/src/fontfile/renderers.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "fntfilst.h"
+#include <X11/fonts/fntfilst.h>
 extern void ErrorF(const char *f, ...);
 
 static FontRenderersRec	renderers;