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

11 files changed, 24 insertions, 24 deletions

diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
index 1bcf3cb..37d54a2 100644
--- a/src/bitmap/bdfread.c
+++ b/src/bitmap/bdfread.c
@@ -55,10 +55,10 @@ from The Open Group.
 #ifndef FONTMODULE
 #include <ctype.h>
 #endif
-#include "fntfilst.h"
-#include "fontutil.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/fontutil.h>
 /* use bitmap structure */
-#include "bitmap.h"
+#include <X11/fonts/bitmap.h>
 #include "bdfint.h"
 
 #define INDICES 256
diff --git a/src/bitmap/bdfutils.c b/src/bitmap/bdfutils.c
index af3e4e6..3128eab 100644
--- a/src/bitmap/bdfutils.c
+++ b/src/bitmap/bdfutils.c
@@ -57,10 +57,10 @@ from The Open Group.
 #include <stdarg.h>
 #endif
 
-#include "fntfilst.h"
+#include <X11/fonts/fntfilst.h>
 #include <X11/fonts/fontstruct.h>
 /* use bitmap structure */
-#include "bitmap.h"
+#include <X11/fonts/bitmap.h>
 #include "bdfint.h"
 
 int bdfFileLineNum;
diff --git a/src/bitmap/bitmap.c b/src/bitmap/bitmap.c
index 8c37f69..eb6caf2 100644
--- a/src/bitmap/bitmap.c
+++ b/src/bitmap/bitmap.c
@@ -31,8 +31,8 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
 
 int
 bitmapGetGlyphs(FontPtr pFont, unsigned long count, unsigned char *chars, 
diff --git a/src/bitmap/bitmapfunc.c b/src/bitmap/bitmapfunc.c
index 4312e88..28028f9 100644
--- a/src/bitmap/bitmapfunc.c
+++ b/src/bitmap/bitmapfunc.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "fntfilst.h"
-#include "bitmap.h"
-#include "fontutil.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
+#include <X11/fonts/fontutil.h>
 #include "bdfint.h"
 #include "pcf.h"
 #include "snfstr.h"
diff --git a/src/bitmap/bitmaputil.c b/src/bitmap/bitmaputil.c
index 76643b8..79093ab 100644
--- a/src/bitmap/bitmaputil.c
+++ b/src/bitmap/bitmaputil.c
@@ -29,8 +29,8 @@ from The Open Group.
 */
 /* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */
 
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
 #include "bdfint.h"
 
 #ifndef MAXSHORT
diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c
index 1af9f4f..e03da0c 100644
--- a/src/bitmap/bitscale.c
+++ b/src/bitmap/bitscale.c
@@ -32,9 +32,9 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "fntfilst.h"
-#include "bitmap.h"
-#include "fontutil.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
+#include <X11/fonts/fontutil.h>
 #ifndef FONTMODULE
 #ifdef _XOPEN_SOURCE
 #include <math.h>
diff --git a/src/bitmap/fontink.c b/src/bitmap/fontink.c
index c3f5e8c..cc70cd7 100644
--- a/src/bitmap/fontink.c
+++ b/src/bitmap/fontink.c
@@ -33,8 +33,8 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
 #include "bdfint.h"
 
 static unsigned char ink_mask_msb[8] = {
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index 0b4b6c7..d8d75f6 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -32,8 +32,8 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
 #include "pcf.h"
 
 #ifndef MAX
diff --git a/src/bitmap/pcfwrite.c b/src/bitmap/pcfwrite.c
index a55369f..03742f5 100644
--- a/src/bitmap/pcfwrite.c
+++ b/src/bitmap/pcfwrite.c
@@ -33,8 +33,8 @@ from The Open Group.
  */
 
 
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
 #include "pcf.h"
 
 /* Write PCF font files */
diff --git a/src/bitmap/snfread.c b/src/bitmap/snfread.c
index e40f392..c8bbee0 100644
--- a/src/bitmap/snfread.c
+++ b/src/bitmap/snfread.c
@@ -55,8 +55,8 @@ from The Open Group.
 #include <ctype.h>
 #endif
 
-#include "fntfilst.h"
-#include "bitmap.h"
+#include <X11/fonts/fntfilst.h>
+#include <X11/fonts/bitmap.h>
 #include "snfstr.h"
 
 #include <stdarg.h>
diff --git a/src/bitmap/snfstr.h b/src/bitmap/snfstr.h
index 1043d50..8158089 100644
--- a/src/bitmap/snfstr.h
+++ b/src/bitmap/snfstr.h
@@ -54,7 +54,7 @@ from The Open Group.
 #ifndef SNFSTR_H
 #define SNFSTR_H 1
 
-#include "fntfilio.h"
+#include <X11/fonts/fntfilio.h>
 
 /*-
  * This file describes the Server Natural Font format.