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

10 files changed, 14 insertions, 14 deletions

diff --git a/src/util/atom.c b/src/util/atom.c
index 36a2f44..8c7d17f 100644
--- a/src/util/atom.c
+++ b/src/util/atom.c
@@ -33,7 +33,7 @@ in this Software without prior written authorization from The Open Group.
 
 /* lame atom replacement routines for font applications */
 
-#include "fontmisc.h"
+#include <X11/fonts/fontmisc.h>
 
 typedef struct _AtomList {
     char		*name;
diff --git a/src/util/fontaccel.c b/src/util/fontaccel.c
index 241bee1..28d6866 100644
--- a/src/util/fontaccel.c
+++ b/src/util/fontaccel.c
@@ -33,9 +33,9 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include    "fontmisc.h"
+#include    <X11/fonts/fontmisc.h>
 #include    <X11/fonts/fontstruct.h>
-#include    "fontutil.h"
+#include    <X11/fonts/fontutil.h>
 
 void
 FontComputeInfoAccelerators(FontInfoPtr pFontInfo)
diff --git a/src/util/fontnames.c b/src/util/fontnames.c
index ee2985c..6be292e 100644
--- a/src/util/fontnames.c
+++ b/src/util/fontnames.c
@@ -35,7 +35,7 @@ from The Open Group.
  *	@(#)fontnames.c	3.1	91/04/10
  */
 
-#include	"fontmisc.h"
+#include	<X11/fonts/fontmisc.h>
 #include	<X11/fonts/fontstruct.h>
 
 void
diff --git a/src/util/fontutil.c b/src/util/fontutil.c
index d2dfd91..8440b35 100644
--- a/src/util/fontutil.c
+++ b/src/util/fontutil.c
@@ -33,10 +33,10 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include    "fontmisc.h"
+#include    <X11/fonts/fontmisc.h>
 #include    <X11/fonts/fontstruct.h>
 #include    <X11/fonts/FSproto.h>
-#include    "fontutil.h"
+#include    <X11/fonts/fontutil.h>
 
 /* Define global here...  doesn't hurt the servers, and avoids
    unresolved references in font clients.  */
diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c
index 3b0ce6b..9ea1ffc 100644
--- a/src/util/fontxlfd.c
+++ b/src/util/fontxlfd.c
@@ -33,10 +33,10 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include	"fontmisc.h"
+#include	<X11/fonts/fontmisc.h>
 #include	<X11/fonts/fontstruct.h>
-#include	"fontxlfd.h"
-#include	"fontutil.h"
+#include	<X11/fonts/fontxlfd.h>
+#include	<X11/fonts/fontutil.h>
 #include	<X11/Xos.h>
 #include	<math.h>
 #include	<stdlib.h>
diff --git a/src/util/format.c b/src/util/format.c
index cdd5b5e..89faae8 100644
--- a/src/util/format.c
+++ b/src/util/format.c
@@ -55,7 +55,7 @@ from The Open Group.
 #include	<X11/fonts/FSproto.h>
 #include	<X11/fonts/font.h>
 #include	<X11/fonts/fontstruct.h>
-#include	"fontutil.h"
+#include	<X11/fonts/fontutil.h>
 
 int
 CheckFSFormat(fsBitmapFormat format, 
diff --git a/src/util/miscutil.c b/src/util/miscutil.c
index 2d4e973..0ee0c3f 100644
--- a/src/util/miscutil.c
+++ b/src/util/miscutil.c
@@ -31,7 +31,7 @@ from The Open Group.
 
 #include <X11/Xosdefs.h>
 #include <stdlib.h>
-#include "fontmisc.h"
+#include <X11/fonts/fontmisc.h>
 
 #define XK_LATIN1
 #include    <X11/keysymdef.h>
diff --git a/src/util/patcache.c b/src/util/patcache.c
index e62af6d..cc81954 100644
--- a/src/util/patcache.c
+++ b/src/util/patcache.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include    <fontmisc.h>
+#include    <X11/fonts/fontmisc.h>
 #include    <X11/fonts/fontstruct.h>
 
 /*
diff --git a/src/util/private.c b/src/util/private.c
index 8e83c74..19d30c4 100644
--- a/src/util/private.c
+++ b/src/util/private.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include    "fontmisc.h"
+#include    <X11/fonts/fontmisc.h>
 #include    <X11/fonts/fontstruct.h>
 
 static int _FontPrivateAllocateIndex = 0;
diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c
index 133ad39..a6df83f 100644
--- a/src/util/utilbitmap.c
+++ b/src/util/utilbitmap.c
@@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "fontmisc.h"
+#include <X11/fonts/fontmisc.h>
 
 /* Utility functions for reformating font bitmaps */