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

17 files changed, 68 insertions, 0 deletions

diff --git a/render/animcur.c b/render/animcur.c
index 1e857574e..e3915b2b8 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -32,6 +32,10 @@
  * delta times between each image.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include "servermd.h"
diff --git a/render/filter.c b/render/filter.c
index 5bd4efd56..d2e8bcc03 100644
--- a/render/filter.c
+++ b/render/filter.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/render/glyph.c b/render/glyph.c
index e224eab85..f3056711a 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -23,6 +23,10 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/misc.h>
 #include "scrnintstr.h"
 #include <X11/os.h>
diff --git a/render/glyphstr.h b/render/glyphstr.h
index f4777a248..f582343d9 100644
--- a/render/glyphstr.h
+++ b/render/glyphstr.h
@@ -23,6 +23,10 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _GLYPHSTR_H_
 #define _GLYPHSTR_H_
 
diff --git a/render/miglyph.c b/render/miglyph.c
index 72ff16bb2..237ec13a4 100644
--- a/render/miglyph.c
+++ b/render/miglyph.c
@@ -23,6 +23,10 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/render/miindex.c b/render/miindex.c
index d6032cd46..03e2857a2 100644
--- a/render/miindex.c
+++ b/render/miindex.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _MIINDEX_H_
 #define _MIINDEX_H_
 
diff --git a/render/mipict.c b/render/mipict.c
index a16e88cd9..81c775832 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/render/mipict.h b/render/mipict.h
index e6e8b70fa..c15d1e1c5 100644
--- a/render/mipict.h
+++ b/render/mipict.h
@@ -23,6 +23,10 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _MIPICT_H_
 #define _MIPICT_H_
 
diff --git a/render/mirect.c b/render/mirect.c
index d4b8522fa..096bb5cb2 100644
--- a/render/mirect.c
+++ b/render/mirect.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/render/mitrap.c b/render/mitrap.c
index 12aa88f06..be1712420 100644
--- a/render/mitrap.c
+++ b/render/mitrap.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/render/mitri.c b/render/mitri.c
index c81d53164..974225350 100644
--- a/render/mitri.c
+++ b/render/mitri.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/render/picture.c b/render/picture.c
index 48faa9b24..e83b1d07d 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -23,6 +23,10 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/render/picture.h b/render/picture.h
index b09d9aac2..e04790374 100644
--- a/render/picture.h
+++ b/render/picture.h
@@ -23,6 +23,10 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _PICTURE_H_
 #define _PICTURE_H_
 
diff --git a/render/picturestr.h b/render/picturestr.h
index 58b840c6d..681bd9663 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -23,6 +23,10 @@
  * Author:  Keith Packard, SuSE, Inc.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _PICTURESTR_H_
 #define _PICTURESTR_H_
 
diff --git a/render/render.c b/render/render.c
index 6451ab803..8ef321980 100644
--- a/render/render.c
+++ b/render/render.c
@@ -26,6 +26,10 @@
 
 #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/misc.h>
diff --git a/render/renderedge.c b/render/renderedge.c
index b84eec14d..4534fe095 100644
--- a/render/renderedge.c
+++ b/render/renderedge.c
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "renderedge.h"
 
 /*
diff --git a/render/renderedge.h b/render/renderedge.h
index d621d9dcf..20eeacc47 100644
--- a/render/renderedge.h
+++ b/render/renderedge.h
@@ -22,6 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _RENDEREDGE_H_
 #define _RENDEREDGE_H_