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

21 files changed, 87 insertions, 0 deletions

diff --git a/os/WaitFor.c b/os/WaitFor.c
index 18eacbdba..899ad42f7 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -56,6 +56,10 @@ SOFTWARE.
  *
  *****************************************************************/
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
diff --git a/os/access.c b/os/access.c
index baad02fda..4e5f75f3f 100644
--- a/os/access.c
+++ b/os/access.c
@@ -57,6 +57,10 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
diff --git a/os/auth.c b/os/auth.c
index 8954f2869..19c5534d3 100644
--- a/os/auth.c
+++ b/os/auth.c
@@ -33,6 +33,10 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef K5AUTH
 # include   <krb5/krb5.h>
 #endif
diff --git a/os/connection.c b/os/connection.c
index 45063c8a6..fd4024577 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -63,11 +63,18 @@ SOFTWARE.
  *
  *****************************************************************/
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
 #include <X11/Xtrans/Xtrans.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/os/io.c b/os/io.c
index 4e9f696c6..87166fb79 100644
--- a/os/io.c
+++ b/os/io.c
@@ -55,6 +55,10 @@ SOFTWARE.
  *****************************************************************/
 /* $XFree86: xc/programs/Xserver/os/io.c,v 3.34 2002/05/31 18:46:05 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #if 0
 #define DEBUG_COMMUNICATION
 #endif
diff --git a/os/k5auth.c b/os/k5auth.c
index ebf16c9eb..b23a3d440 100644
--- a/os/k5auth.c
+++ b/os/k5auth.c
@@ -36,6 +36,10 @@ from The Open Group.
  * krb5 distribution. (At least the checking part)
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #ifdef TCPCONN
diff --git a/os/lbxio.c b/os/lbxio.c
index 21724b58c..0a128df5b 100644
--- a/os/lbxio.c
+++ b/os/lbxio.c
@@ -49,6 +49,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: lbxio.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/Xtrans/Xtrans.h>
 #include <X11/Xmd.h>
diff --git a/os/log.c b/os/log.c
index dc7642af2..4bebbe784 100644
--- a/os/log.c
+++ b/os/log.c
@@ -78,6 +78,10 @@ OR PERFORMANCE OF THIS SOFTWARE.
 
 /* $XFree86: xc/programs/Xserver/os/log.c,v 1.6 2003/11/07 13:45:27 tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/Xos.h>
 #include <stdio.h>
 #include <time.h>
diff --git a/os/mitauth.c b/os/mitauth.c
index dfaea35ab..9a806c02b 100644
--- a/os/mitauth.c
+++ b/os/mitauth.c
@@ -33,6 +33,10 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/os.h>
 #include "osdep.h"
diff --git a/os/oscolor.c b/os/oscolor.c
index bb927c4b6..65de9e4f5 100644
--- a/os/oscolor.c
+++ b/os/oscolor.c
@@ -47,6 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: oscolor.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef USE_RGB_TXT
 
 #ifdef NDBM
diff --git a/os/osdep.h b/os/osdep.h
index f1cc8b3a2..1ede06552 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -47,6 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: osdep.h,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _OSDEP_H_
 #define _OSDEP_H_ 1
 
diff --git a/os/osinit.c b/os/osinit.c
index 03a017b85..b820c91be 100644
--- a/os/osinit.c
+++ b/os/osinit.c
@@ -47,6 +47,10 @@ SOFTWARE.
 ******************************************************************/
 /* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/os.h>
diff --git a/os/rpcauth.c b/os/rpcauth.c
index 037a4facf..71f87e9a4 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -34,6 +34,10 @@ from The Open Group.
  */
 
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef SECURE_RPC
 
 #include <X11/X.h>
diff --git a/os/secauth.c b/os/secauth.c
index 553f50a3a..ff057992f 100644
--- a/os/secauth.c
+++ b/os/secauth.c
@@ -26,6 +26,10 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/os.h>
 #include "osdep.h"
diff --git a/os/strlcat.c b/os/strlcat.c
index 7031de3a6..28e2338f9 100644
--- a/os/strlcat.c
+++ b/os/strlcat.c
@@ -18,6 +18,10 @@
 /* $XFree86$ */
 
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include <sys/types.h>
 #include <string.h>
 
diff --git a/os/strlcpy.c b/os/strlcpy.c
index 71657da69..42442cc30 100644
--- a/os/strlcpy.c
+++ b/os/strlcpy.c
@@ -17,6 +17,10 @@
  */
 /* $XFree86$ */
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include <sys/types.h>
 #include <string.h>
 
diff --git a/os/utils.c b/os/utils.c
index a94c29481..a3a0c99f6 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -52,6 +52,10 @@ OR PERFORMANCE OF THIS SOFTWARE.
 */
 /* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef __CYGWIN__
 #include <stdlib.h>
 #include <signal.h>
diff --git a/os/xalloc.c b/os/xalloc.c
index f257cf41c..c266ca5ab 100644
--- a/os/xalloc.c
+++ b/os/xalloc.c
@@ -31,6 +31,10 @@ Pascal Haible.
 /* Only used if INTERNAL_MALLOC is defined
  * - otherwise xalloc() in utils.c is used
  */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef INTERNAL_MALLOC
 
 #include <stdlib.h>	/* for malloc() etc. */
diff --git a/os/xdmauth.c b/os/xdmauth.c
index 9c8bc2cdb..f54c83da8 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -35,6 +35,10 @@ from The Open Group.
  * Author:  Keith Packard, MIT X Consortium
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xtrans/Xtrans.h>
diff --git a/os/xdmcp.c b/os/xdmcp.c
index f90536b5f..44994380b 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -16,6 +16,10 @@
  */
 /* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef WIN32
 #include <X11/Xwinsock.h>
 #endif
diff --git a/os/xprintf.c b/os/xprintf.c
index 70051f26f..bd8b1f339 100644
--- a/os/xprintf.c
+++ b/os/xprintf.c
@@ -26,6 +26,10 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/Xos.h>
 #include <X11/os.h>
 #include <stdarg.h>