summaryrefslogtreecommitdiff
path: root/GL/glx/glxmem.h
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
commite03198972ca78b03ad13cb49112c03a052bb763b (patch)
tree1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /GL/glx/glxmem.h
parentb8aef6c474ffc6d637bec178674898ea95ccde47 (diff)
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>.
Diffstat (limited to 'GL/glx/glxmem.h')
-rw-r--r--GL/glx/glxmem.h6
1 files changed, 5 insertions, 1 deletions
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_