From e03198972ca78b03ad13cb49112c03a052bb763b Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 3 Jul 2005 07:02:09 +0000
Subject: 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>.

---
 GL/mesa/X/xf86glx.c      | 4 ++++
 GL/mesa/X/xf86glx_util.c | 4 ++++
 GL/mesa/X/xf86glx_util.h | 4 ++++
 GL/mesa/X/xf86glxint.h   | 4 ++++
 4 files changed, 16 insertions(+)

(limited to 'GL/mesa')

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_
 
-- 
cgit v1.2.3