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>.
2005-07-03 07:02:09 +00:00 · 2005-07-03 07:02:09 +00:00 · e03198972c
commit e03198972c
parent b8aef6c474
1248 changed files with 5222 additions and 185 deletions
--- a/GL/apple/aglGlx.c
+++ b/GL/apple/aglGlx.c
@ -34,6 +34,10 @@
 */
 /* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "quartzCommon.h"
 #include <AGL/agl.h>
 #include "cr.h"
--- a/GL/apple/indirect.c
+++ b/GL/apple/indirect.c
@ -33,6 +33,10 @@
 */
 /* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "dri.h"
 #include "quartz.h"

--- a/GL/glx/g_disptab.c
+++ b/GL/glx/g_disptab.c
@ -29,6 +29,10 @@
 ** version 1.2.1 Specification.
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "g_disptab.h"
--- a/GL/glx/g_disptab.h
+++ b/GL/glx/g_disptab.h
@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _GLX_g_disptab_h_
 #define _GLX_g_disptab_h_
 /*
--- a/GL/glx/g_disptab_EXT.c
+++ b/GL/glx/g_disptab_EXT.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
@ -29,6 +29,10 @@
 ** version 1.2.1 Specification.
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "g_disptab_EXT.h"
@ -45,8 +49,13 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
+#ifndef MISSING_GL_EXTS
 	__glXDisp_PointParameterfARB, /* 2065 */
 	__glXDisp_PointParameterfvARB, /* 2066 */
+#else
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+#endif
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
@ -2104,6 +2113,7 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
 	__glXDisp_CopyTexSubImage1D,  /* 4121 */
 	__glXDisp_CopyTexSubImage2D,  /* 4122 */
 	__glXDisp_CopyTexSubImage3D,  /* 4123 */
+#ifndef MISSING_GL_EXTS
 	__glXDisp_FogCoordfv,         /* 4124 */
 	__glXDisp_FogCoorddv,         /* 4125 */
 	__glXDisp_SecondaryColor3bv,  /* 4126 */
@ -2115,6 +2125,19 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
 	__glXDisp_SecondaryColor3usv, /* 4132 */
 	__glXDisp_SecondaryColor3uiv, /* 4133 */
 	__glXDisp_BlendFuncSeparate,  /* 4134 */
+#else
+	__glXNoSuchRenderOpcode,      /* 4124 */
+	__glXNoSuchRenderOpcode,      /* 4125 */
+	__glXNoSuchRenderOpcode,      /* 4126 */
+	__glXNoSuchRenderOpcode,      /* 4127 */
+	__glXNoSuchRenderOpcode,      /* 4128 */
+	__glXNoSuchRenderOpcode,      /* 4129 */
+	__glXNoSuchRenderOpcode,      /* 4130 */
+	__glXNoSuchRenderOpcode,      /* 4131 */
+	__glXNoSuchRenderOpcode,      /* 4132 */
+	__glXNoSuchRenderOpcode,      /* 4133 */
+	__glXNoSuchRenderOpcode,      /* 4134 */
+#endif
 	__glXNoSuchRenderOpcode,      /* 4135 */
 	__glXNoSuchRenderOpcode,      /* 4136 */
 	__glXNoSuchRenderOpcode,      /* 4137 */
@ -2200,9 +2223,20 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode, /* 4219 */
+#ifndef MISSING_GL_EXTS
 	__glXDisp_ActiveStencilFaceEXT, /* 4220 */
+# ifndef __DARWIN__
 	__glXDisp_PointParameteri,      /* 4221 */
 	__glXDisp_PointParameteriv,     /* 4222 */
+# else
+	__glXDisp_PointParameteriNV,    /* 4221 */
+	__glXDisp_PointParameterivNV,   /* 4222 */
+# endif
+#else
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+#endif
 };
 __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = {
 	__glXDisp_AreTexturesResidentEXT, /* 11 */
@ -2225,8 +2259,13 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
+#ifndef MISSING_GL_EXTS
 	__glXDispSwap_PointParameterfARB, /* 2065 */
 	__glXDispSwap_PointParameterfvARB, /* 2066 */
+#else
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+#endif
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
@ -4284,6 +4323,7 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
 	__glXDispSwap_CopyTexSubImage1D,  /* 4121 */
 	__glXDispSwap_CopyTexSubImage2D,  /* 4122 */
 	__glXDispSwap_CopyTexSubImage3D,  /* 4123 */
+#ifndef MISSING_GL_EXTS
 	__glXDispSwap_FogCoordfv,         /* 4124 */
 	__glXDispSwap_FogCoorddv,         /* 4125 */
 	__glXDispSwap_SecondaryColor3bv,  /* 4126 */
@ -4295,6 +4335,19 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
 	__glXDispSwap_SecondaryColor3usv, /* 4132 */
 	__glXDispSwap_SecondaryColor3uiv, /* 4133 */
 	__glXDisp_BlendFuncSeparate,      /* 4134 */
+#else
+	__glXNoSuchRenderOpcode,          /* 4124 */
+	__glXNoSuchRenderOpcode,          /* 4125 */
+	__glXNoSuchRenderOpcode,          /* 4126 */
+	__glXNoSuchRenderOpcode,          /* 4127 */
+	__glXNoSuchRenderOpcode,          /* 4128 */
+	__glXNoSuchRenderOpcode,          /* 4129 */
+	__glXNoSuchRenderOpcode,          /* 4130 */
+	__glXNoSuchRenderOpcode,          /* 4131 */
+	__glXNoSuchRenderOpcode,          /* 4132 */
+	__glXNoSuchRenderOpcode,          /* 4133 */
+	__glXNoSuchRenderOpcode,          /* 4134 */
+#endif
 	__glXNoSuchRenderOpcode,          /* 4135 */
 	__glXNoSuchRenderOpcode,          /* 4136 */
 	__glXNoSuchRenderOpcode,          /* 4137 */
@ -4380,9 +4433,20 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode,
 	__glXNoSuchRenderOpcode, /* 4219 */
+#ifndef MISSING_GL_EXTS
 	__glXDispSwap_ActiveStencilFaceEXT, /* 4220 */
+# ifndef __DARWIN__
 	__glXDispSwap_PointParameteri,      /* 4221 */
 	__glXDispSwap_PointParameteriv,     /* 4222 */
+# else
+	__glXDispSwap_PointParameteriNV,    /* 4221 */
+	__glXDispSwap_PointParameterivNV,   /* 4222 */
+# endif
+#else
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+	__glXNoSuchRenderOpcode,
+#endif
 };
 __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = {
 	__glXDispSwap_AreTexturesResidentEXT, /* 11 */
--- a/GL/glx/g_disptab_EXT.h
+++ b/GL/glx/g_disptab_EXT.h
@ -1,5 +1,9 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _GLX_g_disptab_EXT_h_
 #define _GLX_g_disptab_EXT_h_
 /*
@ -95,10 +99,17 @@ extern void __glXDispSwap_SecondaryColor3dv(GLbyte *);
 extern void __glXDisp_BlendFuncSeparate(GLbyte *);
 extern void __glXDispSwap_BlendFuncSeparate(GLbyte *);

+#ifdef __DARWIN__
+extern void __glXDisp_PointParameteriNV(GLbyte *);
+extern void __glXDisp_PointParameterivNV(GLbyte *);
+extern void __glXDispSwap_PointParameteriNV(GLbyte *);
+extern void __glXDispSwap_PointParameterivNV(GLbyte *);
+#else
 extern void __glXDisp_PointParameteri(GLbyte *);
 extern void __glXDisp_PointParameteriv(GLbyte *);
 extern void __glXDispSwap_PointParameteri(GLbyte *);
 extern void __glXDispSwap_PointParameteriv(GLbyte *);
+#endif

 extern void __glXDisp_ActiveStencilFaceEXT(GLbyte*);

--- a/GL/glx/g_render.c
+++ b/GL/glx/g_render.c
@ -30,6 +30,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "g_disptab.h"
--- a/GL/glx/g_renderswap.c
+++ b/GL/glx/g_renderswap.c
@ -29,6 +29,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "g_disptab.h"
--- a/GL/glx/g_single.c
+++ b/GL/glx/g_single.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -29,6 +29,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "g_disptab.h"
@ -1264,7 +1268,6 @@ int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)

 int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 {
-	GLsizei n;
 	__GLXcontext *cx;
 	int error;

@ -1273,7 +1276,6 @@ int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
 		return error;
 	}
 	pc += __GLX_SINGLE_HDR_SIZE;
-	n = *(GLsizei *)(pc + 0);

 	glDeleteTextures( 
 		*(GLsizei  *)(pc + 0),
@ -1717,7 +1719,6 @@ int __glXDisp_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)

 int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 {
-	GLsizei n;
 	__GLXcontext *cx;
 	int error;

@ -1726,7 +1727,6 @@ int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
 		return error;
 	}
 	pc += __GLX_VENDPRIV_HDR_SIZE;
-	n = *(GLsizei *)(pc + 0);

 	glDeleteTexturesEXT( 
 		*(GLsizei  *)(pc + 0),
--- a/GL/glx/g_singleswap.c
+++ b/GL/glx/g_singleswap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.4tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -29,6 +29,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "g_disptab.h"
--- a/GL/glx/global.c
+++ b/GL/glx/global.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -35,6 +35,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"

 /*
--- a/GL/glx/glxbuf.c
+++ b/GL/glx/glxbuf.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.7 2001/10/31 22:50:26 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.6 2001/03/25 05:32:01 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -34,6 +34,10 @@
 **
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxbuf.h"
--- a/GL/glx/glxbuf.h
+++ b/GL/glx/glxbuf.h
@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _glxbuf_h_
 #define _glxbuf_h_

--- a/GL/glx/glxcmds.c
+++ b/GL/glx/glxcmds.c
@ -36,6 +36,10 @@

 #define NEED_REPLIES
 #define FONT_PCF
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <unpack.h>
--- a/GL/glx/glxcmdsswap.c
+++ b/GL/glx/glxcmdsswap.c
@ -36,6 +36,10 @@

 #define NEED_REPLIES
 #define FONT_PCF
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include <GL/glxtokens.h>
--- a/GL/glx/glxcontext.h
+++ b/GL/glx/glxcontext.h
@ -1,4 +1,8 @@
 /* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.4 2002/02/22 21:45:07 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _GLX_context_h_
 #define _GLX_context_h_

--- a/GL/glx/glxdrawable.h
+++ b/GL/glx/glxdrawable.h
@ -1,4 +1,8 @@
 /* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _GLX_drawable_h_
 #define _GLX_drawable_h_

--- a/GL/glx/glxerror.h
+++ b/GL/glx/glxerror.h
@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _GLX_error_h_
 #define _GLX_error_h_

--- a/GL/glx/glxext.c
+++ b/GL/glx/glxext.c
@ -19,6 +19,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include <windowstr.h>
 #include <propertyst.h>
--- a/GL/glx/glxext.h
+++ b/GL/glx/glxext.h
@ -1,4 +1,8 @@
 /* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.7 2003/11/17 22:20:26 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _glxext_h_
 #define _glxext_h_

--- a/GL/glx/glxfb.c
+++ b/GL/glx/glxfb.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -38,6 +38,10 @@
 ** An implementation of a buffer which is part of the front buffer
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxfb.h"
--- a/GL/glx/glxfb.h
+++ b/GL/glx/glxfb.h
@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _glxfb_h_
 #define _glxfb_h_

--- a/GL/glx/glximports.c
+++ b/GL/glx/glximports.c
@ -34,6 +34,10 @@
 **
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxcontext.h"
 #include "glximports.h"
--- a/GL/glx/glximports.h
+++ b/GL/glx/glximports.h
@ -1,4 +1,8 @@
 /* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _glximports_h_
 #define _glximports_h_

--- a/GL/glx/glxmem.c
+++ b/GL/glx/glxmem.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.7 2002/08/28 06:41:26 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -38,6 +38,10 @@
 ** Implementation of a buffer in main memory
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxmem.h"
 #include "glxext.h"
--- a/GL/glx/glxmem.h
+++ b/GL/glx/glxmem.h
@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _glxmem_h_
 #define _glxmem_h_

--- a/GL/glx/glxpix.c
+++ b/GL/glx/glxpix.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -38,6 +38,10 @@
 ** An implementation of a glx pixmap buffer 
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxpix.h"
--- a/GL/glx/glxpix.h
+++ b/GL/glx/glxpix.h
@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
+/* $XFree86$ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _glxpix_h_
 #define _glxpix_h_

--- a/GL/glx/glxscreens.c
+++ b/GL/glx/glxscreens.c
@ -34,6 +34,10 @@
 **
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifdef IN_MODULE
 #include <xf86_ansic.h>
 #else
--- a/GL/glx/glxscreens.h
+++ b/GL/glx/glxscreens.h
@ -1,3 +1,7 @@
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _GLX_screens_h_
 #define _GLX_screens_h_

--- a/GL/glx/glxserver.h
+++ b/GL/glx/glxserver.h
@ -1,4 +1,8 @@
 /* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _GLX_server_h_
 #define _GLX_server_h_

--- a/GL/glx/glxutil.c
+++ b/GL/glx/glxutil.c
@ -36,6 +36,10 @@

 #define NEED_REPLIES
 #define FONT_PCF
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <unpack.h>
--- a/GL/glx/glxutil.h
+++ b/GL/glx/glxutil.h
@ -1,4 +1,8 @@
 /* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _glxcmds_h_
 #define _glxcmds_h_

--- a/GL/glx/impsize.h
+++ b/GL/glx/impsize.h
@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _impsize_h_
 #define _impsize_h_

--- a/GL/glx/render2.c
+++ b/GL/glx/render2.c
@ -35,6 +35,10 @@
 */

 /* #define NEED_REPLIES */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <glxserver.h>
 #include "unpack.h"
 #include "g_disptab.h"
--- a/GL/glx/render2swap.c
+++ b/GL/glx/render2swap.c
@ -35,6 +35,10 @@
 */

 /* #define NEED_REPLIES */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "unpack.h"
 #include "g_disptab.h"
--- a/GL/glx/renderpix.c
+++ b/GL/glx/renderpix.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -35,6 +35,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "unpack.h"
 #include "g_disptab.h"
--- a/GL/glx/renderpixswap.c
+++ b/GL/glx/renderpixswap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -35,6 +35,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "unpack.h"
 #include "g_disptab.h"
--- a/GL/glx/rensize.c
+++ b/GL/glx/rensize.c
@ -34,6 +34,10 @@
 **
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <GL/gl.h>
 #include "glxserver.h"
 #include "GL/glxproto.h"
--- a/GL/glx/rensizetab.c
+++ b/GL/glx/rensizetab.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.5 2004/01/28 18:11:53 alanh Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -34,6 +34,10 @@
 **
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "g_disptab_EXT.h"

--- a/GL/glx/single2.c
+++ b/GL/glx/single2.c
@ -35,6 +35,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxext.h"
--- a/GL/glx/single2swap.c
+++ b/GL/glx/single2swap.c
@ -35,6 +35,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxext.h"
--- a/GL/glx/singlepix.c
+++ b/GL/glx/singlepix.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -35,6 +35,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "singlesize.h"
--- a/GL/glx/singlepixswap.c
+++ b/GL/glx/singlepixswap.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -35,6 +35,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxext.h"
 #include "singlesize.h"
--- a/GL/glx/singlesize.c
+++ b/GL/glx/singlesize.c
@ -34,6 +34,10 @@
 **
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <GL/gl.h>
 #include "glxserver.h"
 #include "singlesize.h"
--- a/GL/glx/singlesize.h
+++ b/GL/glx/singlesize.h
@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _singlesize_h_
 #define _singlesize_h_

--- a/GL/glx/unpack.h
+++ b/GL/glx/unpack.h
@ -1,4 +1,8 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.5 2002/10/30 12:52:03 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.4 2002/01/14 22:47:08 tsi Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef __GLX_unpack_h__
 #define __GLX_unpack_h__

--- a/GL/glx/xfont.c
+++ b/GL/glx/xfont.c
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
+/* $XFree86$ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
@ -35,6 +35,10 @@
 */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "g_disptab.h"
--- a/GL/include/GL/glx_ansic.h
+++ b/GL/include/GL/glx_ansic.h
@ -1,7 +1,11 @@
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _glx_ansic_h_
 #define _glx_ansic_h_

-/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.5 2001/03/21 20:49:08 dawes Exp $ */
 /*
 ** License Applicability. Except to the extent portions of this file are
 ** made subject to an alternative license as permitted in the SGI Free
--- a/GL/include/GL/xf86glx.h
+++ b/GL/include/GL/xf86glx.h
@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */
 /**************************************************************************

 Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "miscstruct.h"

 #ifdef XFree86LOADER
--- a/GL/mesa/X/xf86glx.c
+++ b/GL/mesa/X/xf86glx.c
@ -33,6 +33,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <regionstr.h>
 #include <resource.h>
 #include <GL/gl.h>
--- a/GL/mesa/X/xf86glx_util.c
+++ b/GL/mesa/X/xf86glx_util.c
@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *   Brian Paul <brian@precisioninsight.com>
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <gcstruct.h>
 #include "pixmapstr.h"
 #include "xf86glx_util.h"
--- a/GL/mesa/X/xf86glx_util.h
+++ b/GL/mesa/X/xf86glx_util.h
@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *   Brian Paul <brian@precisioninsight.com>
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _XF86GLX_UTIL_H_
 #define _XF86GLX_UTIL_H_

--- a/GL/mesa/X/xf86glxint.h
+++ b/GL/mesa/X/xf86glxint.h
@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 *
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _XF86GLXINT_H_
 #define _XF86GLXINT_H_

--- a/GL/windows/glwindows.h
+++ b/GL/windows/glwindows.h
@ -1,3 +1,7 @@
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/Xwindows.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
--- a/GL/windows/glwrap.c
+++ b/GL/windows/glwrap.c
@ -5,6 +5,10 @@
 * Authors: Alexander Gottwald
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/Xwindows.h>
 #include <GL/gl.h>
 #include <GL/glext.h>
--- a/GL/windows/indirect.c
+++ b/GL/windows/indirect.c
@ -42,6 +42,10 @@



+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "glwindows.h"
 #include <glcontextmodes.h>
 #include <stdint.h>
--- a/XTrap/xtrapddmi.c
+++ b/XTrap/xtrapddmi.c
@ -38,6 +38,10 @@ SOFTWARE.
 *
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef EXTMODULE
 #include <errno.h>
 #include <X11/Xos.h>
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@ -51,6 +51,10 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef EXTMODULE
 #include <stdio.h>
 #include <errno.h>
--- a/XTrap/xtrapdiswp.c
+++ b/XTrap/xtrapdiswp.c
@ -45,6 +45,10 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
--- a/XTrap/xtrapditbl.c
+++ b/XTrap/xtrapditbl.c
@ -35,6 +35,10 @@ SOFTWARE.
 /*-----------------*
 *  Include Files  *
 *-----------------*/
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "dixstruct.h"
--- a/Xext/EVIstruct.h
+++ b/Xext/EVIstruct.h
@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef EVI_STRUCT_H
 #define EVI_STRUCT_H

--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@ -28,6 +28,10 @@ from The Open Group.

 #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>
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@ -29,6 +29,10 @@ from The Open Group.
 /* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */

 #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>
--- a/Xext/cup.c
+++ b/Xext/cup.c
@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group.

 #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>
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@ -35,6 +35,10 @@ Equipment Corporation.

 /* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
--- a/Xext/dpmsproc.h
+++ b/Xext/dpmsproc.h
@ -2,6 +2,10 @@

 /* Prototypes for functions that the DDX must provide */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _DPMSPROC_H_
 #define _DPMSPROC_H_

--- a/Xext/dpmsstubs.c
+++ b/Xext/dpmsstubs.c
@ -30,6 +30,10 @@ Equipment Corporation.

 typedef int Bool;

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "dpmsproc.h"

 #define FALSE 0
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@ -33,6 +33,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>
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 #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 "window.h"
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.

 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/Xext/mbufpx.c
+++ b/Xext/mbufpx.c
@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: mbufpx.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 #define NEED_REPLIES
 #define NEED_EVENTS
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@ -30,6 +30,10 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */

 #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>
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@ -26,6 +26,10 @@ Equipment Corporation.
 /* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */

 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@ -36,6 +36,10 @@ Equipment Corporation.
 *	PanoramiX definitions
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_

--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@ -25,6 +25,10 @@ Equipment Corporation.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@ -28,6 +28,10 @@ Equipment Corporation.

 /* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #define NEED_REPLIES
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@ -1,5 +1,9 @@
 /* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _PANORAMIXSRV_H_
 #define _PANORAMIXSRV_H_

--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ********************************************************/
 /* $XFree86$ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "dixstruct.h"
--- a/Xext/saver.c
+++ b/Xext/saver.c
@ -32,6 +32,10 @@ in this Software without prior written authorization from the X Consortium.

 #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>
--- a/Xext/security.c
+++ b/Xext/security.c
@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "windowstr.h"
--- a/Xext/shape.c
+++ b/Xext/shape.c
@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.
 /* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */
 #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>
--- a/Xext/shm.c
+++ b/Xext/shm.c
@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group.

 #define SHM

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #ifndef Lynx
 #include <sys/ipc.h>
--- a/Xext/sleepuntil.c
+++ b/Xext/sleepuntil.c
@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group.

 /* dixsleep.c - implement millisecond timeouts for X clients */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "sleepuntil.h"
 #include <X11/X.h>
 #include <X11/Xmd.h>
--- a/Xext/sleepuntil.h
+++ b/Xext/sleepuntil.h
@ -25,6 +25,10 @@
 * XFree86 Project.
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef _SLEEPUNTIL_H_
 #define _SLEEPUNTIL_H_ 1

--- a/Xext/sync.c
+++ b/Xext/sync.c
@ -54,6 +54,10 @@ PERFORMANCE OF THIS SOFTWARE.

 #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/Xmd.h>
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@ -30,6 +30,10 @@ from The Open Group.

 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@ -34,6 +34,10 @@ of the copyright holder.

 #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>
--- a/Xext/xf86bigfont.c
+++ b/Xext/xf86bigfont.c
@ -35,6 +35,10 @@
 * XLoadQueryFont).
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <sys/types.h>
 #ifdef HAS_SHM
 #if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2)
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@ -67,6 +67,10 @@ copyright holders.
 /* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */

 #define _XP_PRINT_SERVER_
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xos.h>
 #define NEED_EVENTS
--- a/Xext/xres.c
+++ b/Xext/xres.c
@ -6,6 +6,10 @@

 #define NEED_EVENTS
 #define NEED_REPLIES
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@ -29,6 +29,10 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #define NEED_EVENTS
 #include <X11/Xproto.h>
--- a/Xext/xtest1dd.c
+++ b/Xext/xtest1dd.c
@ -61,6 +61,10 @@ University of California.
 #define	NEED_EVENTS
 #define	NEED_REPLIES

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/Xos.h>
 #include <X11/X.h>
--- a/Xext/xtest1dd.h
+++ b/Xext/xtest1dd.h
@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 ********************************************************/

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef XTEST1DD_H
 #define XTEST1DD_H 1

--- a/Xext/xtest1di.c
+++ b/Xext/xtest1di.c
@ -62,6 +62,10 @@ University of California.
 #define	 NEED_EVENTS
 #define	 NEED_REPLIES

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@ -48,6 +48,10 @@ SOFTWARE.
 **
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@ -23,6 +23,10 @@ SOFTWARE.
 ******************************************************************/
 /* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #ifndef XVDIX_H
 #define XVDIX_H
 /*
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@ -75,6 +75,10 @@ SOFTWARE.
 **
 */

+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/misc.h>
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@ -2,6 +2,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>
--- a/Show More
+++ b/Show More