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>.
author: Daniel Stone <daniel@fooishbar.org> 2005-07-03 07:02:09 +0000
committer: Daniel Stone <daniel@fooishbar.org> 2005-07-03 07:02:09 +0000
commit: e03198972ca78b03ad13cb49112c03a052bb763b (patch)
tree: 1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /GL
parent: b8aef6c474ffc6d637bec178674898ea95ccde47 (diff)
57 files changed, 320 insertions, 29 deletions
diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c
index fa7533e73..3906d775f 100644
--- 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"
diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c
index 32227617a..bbda59f8f 100644
--- 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"
 
diff --git a/GL/glx/g_disptab.c b/GL/glx/g_disptab.c
index 8c8dc2ccc..93a9d628d 100644
--- 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"
diff --git a/GL/glx/g_disptab.h b/GL/glx/g_disptab.h
index 566650bf7..0580b5529 100644
--- 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_
 /*
diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c
index c37a236db..1ce1bd4a7 100644
--- 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 */
diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h
index 52eb44324..33672379b 100644
--- 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*);
 
diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c
index f014e3be5..28d23da84 100644
--- 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"
diff --git a/GL/glx/g_renderswap.c b/GL/glx/g_renderswap.c
index 5c2ed9f58..e22494ed2 100644
--- 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"
diff --git a/GL/glx/g_single.c b/GL/glx/g_single.c
index 06529e8c5..a60bf44c1 100644
--- 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),
diff --git a/GL/glx/g_singleswap.c b/GL/glx/g_singleswap.c
index 34515997e..026530374 100644
--- 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"
diff --git a/GL/glx/global.c b/GL/glx/global.c
index 9cd011ec9..ef9831ec0 100644
--- 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"
 
 /*
diff --git a/GL/glx/glxbuf.c b/GL/glx/glxbuf.c
index 6e6f6142b..44be53614 100644
--- 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"
diff --git a/GL/glx/glxbuf.h b/GL/glx/glxbuf.h
index a298b3471..88b04e8bd 100644
--- 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_
 
diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c
index f756d1830..f88ec2c99 100644
--- 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>
diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c
index 450b8bb9b..595e814e5 100644
--- 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>
diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h
index 9a16851f0..18d8b44c2 100644
--- 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_
 
diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h
index 1d7f44352..38a05bfeb 100644
--- 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_
 
diff --git a/GL/glx/glxerror.h b/GL/glx/glxerror.h
index 3c1e93c61..2c6d6d863 100644
--- 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_
 
diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c
index c86540fa4..6e0ced935 100644
--- 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>
diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h
index c6cd219c7..41b4e83e6 100644
--- 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_
 
diff --git a/GL/glx/glxfb.c b/GL/glx/glxfb.c
index 4ce952d51..0d433d25d 100644
--- 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"
diff --git a/GL/glx/glxfb.h b/GL/glx/glxfb.h
index 44a72a3e2..325146d43 100644
--- 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_
 
diff --git a/GL/glx/glximports.c b/GL/glx/glximports.c
index b38456f6f..fae2346b9 100644
--- 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"
diff --git a/GL/glx/glximports.h b/GL/glx/glximports.h
index 09d8340af..ef485822e 100644
--- 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_
 
diff --git a/GL/glx/glxmem.c b/GL/glx/glxmem.c
index 0c3ea25a7..21a7c7962 100644
--- 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"
diff --git a/GL/glx/glxmem.h b/GL/glx/glxmem.h
index 93a277559..06720dfdf 100644
--- 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_
 
diff --git a/GL/glx/glxpix.c b/GL/glx/glxpix.c
index b21d4ade9..98c033c98 100644
--- 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"
diff --git a/GL/glx/glxpix.h b/GL/glx/glxpix.h
index d7a9afab0..4b16352b4 100644
--- 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_
 
diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c
index 5a58f265d..4b228cb4f 100644
--- 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
diff --git a/GL/glx/glxscreens.h b/GL/glx/glxscreens.h
index c4d237bbc..2d68c8b60 100644
--- 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_
 
diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h
index 66d681d2d..a30a85381 100644
--- 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_
 
diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c
index 4512aa5e9..03bc19f63 100644
--- 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>
diff --git a/GL/glx/glxutil.h b/GL/glx/glxutil.h
index dbf7084b5..2c3090a46 100644
--- 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_
 
diff --git a/GL/glx/impsize.h b/GL/glx/impsize.h
index 8932fb33f..eee60cc3e 100644
--- 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_
 
diff --git a/GL/glx/render2.c b/GL/glx/render2.c
index 2629a7025..bc49d4fdd 100644
--- 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"
diff --git a/GL/glx/render2swap.c b/GL/glx/render2swap.c
index 7c94b5268..64ba77e5a 100644
--- 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"
diff --git a/GL/glx/renderpix.c b/GL/glx/renderpix.c
index ad5625dd6..fc4034731 100644
--- 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"
diff --git a/GL/glx/renderpixswap.c b/GL/glx/renderpixswap.c
index 3b0e1f6b7..f356969f9 100644
--- 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"
diff --git a/GL/glx/rensize.c b/GL/glx/rensize.c
index 5d7c7b367..9cedecfad 100644
--- 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"
diff --git a/GL/glx/rensizetab.c b/GL/glx/rensizetab.c
index 95ba462b2..41656890c 100644
--- 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"
 
diff --git a/GL/glx/single2.c b/GL/glx/single2.c
index 5869e8f50..9fee5ff49 100644
--- 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"
diff --git a/GL/glx/single2swap.c b/GL/glx/single2swap.c
index c8c496871..dab98ade9 100644
--- 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"
diff --git a/GL/glx/singlepix.c b/GL/glx/singlepix.c
index 85be77d85..845c46a64 100644
--- 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"
diff --git a/GL/glx/singlepixswap.c b/GL/glx/singlepixswap.c
index 2b488312e..ff68ecedf 100644
--- 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"
diff --git a/GL/glx/singlesize.c b/GL/glx/singlesize.c
index 3baf03517..04de960a9 100644
--- 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"
diff --git a/GL/glx/singlesize.h b/GL/glx/singlesize.h
index 829338094..bde62092c 100644
--- 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_
 
diff --git a/GL/glx/unpack.h b/GL/glx/unpack.h
index 62fc43761..723fb85f3 100644
--- 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__
 
diff --git a/GL/glx/xfont.c b/GL/glx/xfont.c
index 3ea767d2b..c4995e272 100644
--- 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"
diff --git a/GL/include/GL/glx_ansic.h b/GL/include/GL/glx_ansic.h
index c50288055..c94393fd1 100644
--- 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
diff --git a/GL/include/GL/xf86glx.h b/GL/include/GL/xf86glx.h
index 7a467b9b5..66f096a98 100644
--- 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
diff --git a/GL/mesa/X/xf86glx.c b/GL/mesa/X/xf86glx.c
index bd8ff7fe0..229e871fa 100644
--- 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>
diff --git a/GL/mesa/X/xf86glx_util.c b/GL/mesa/X/xf86glx_util.c
index ff2654830..6441a4b4f 100644
--- 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"
diff --git a/GL/mesa/X/xf86glx_util.h b/GL/mesa/X/xf86glx_util.h
index 0716d6c7d..809c1550f 100644
--- 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_
 
diff --git a/GL/mesa/X/xf86glxint.h b/GL/mesa/X/xf86glxint.h
index 3d7dcec6f..8b893af6d 100644
--- 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_
 
diff --git a/GL/windows/glwindows.h b/GL/windows/glwindows.h
index 0e269a119..74e81f24f 100644
--- 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>
diff --git a/GL/windows/glwrap.c b/GL/windows/glwrap.c
index 646675765..730b74ed1 100755
--- 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>
diff --git a/GL/windows/indirect.c b/GL/windows/indirect.c
index 4c46ec960..0c7457aa0 100755
--- 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>
author	Daniel Stone <daniel@fooishbar.org>	2005-07-03 07:02:09 +0000
committer	Daniel Stone <daniel@fooishbar.org>	2005-07-03 07:02:09 +0000
commit	e03198972ca78b03ad13cb49112c03a052bb763b (patch)
tree	1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /GL
parent	b8aef6c474ffc6d637bec178674898ea95ccde47 (diff)