glx: remove #include "glheader.h" lines

Was only used to get the PUBLIC/USED macros.
Also, replace "GL_FALSE" with "False" in a couple places.

src/glx/x11/Makefile

@@ -50,7 +50,6 @@ OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS)
 INCLUDES = -I. \
 	-I$(TOP)/include \
 	-I$(TOP)/include/GL/internal \
-	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/mesa/glapi \
 	$(LIBDRM_CFLAGS) \
 	$(DRI2PROTO_CFLAGS) \

src/glx/x11/dri2.c

@@ -36,7 +36,6 @@
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 #include <X11/extensions/dri2proto.h>
-#include "glheader.h"
 #include "xf86drm.h"
 #include "dri2.h"
 
@@ -289,7 +288,7 @@ void DRI2DestroyDrawable(Display *dpy, XID drawable)
 
     XextSimpleCheckExtension (dpy, info, dri2ExtensionName);
 
-    XSync(dpy, GL_FALSE);
+    XSync(dpy, False);
 
     LockDisplay(dpy);
     GetReq(DRI2DestroyDrawable, req);

src/glx/x11/dri2_glx.c

@@ -35,7 +35,6 @@
 #include <X11/Xlib.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/Xdamage.h>
-#include "glheader.h"
 #include "glxclient.h"
 #include "glcontextmodes.h"
 #include "xf86dri.h"

src/glx/x11/dri_common.c

@@ -37,7 +37,7 @@
 
 #include <unistd.h>
 #include <dlfcn.h>
-#include "glheader.h"
+#include <stdarg.h>
 #include "glxclient.h"
 #include "glcontextmodes.h"
 #include "dri_common.h"

src/glx/x11/dri_glx.c

@@ -37,7 +37,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <X11/Xlib.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/Xdamage.h>
-#include "glheader.h"
 #include "glxclient.h"
 #include "glcontextmodes.h"
 #include "xf86dri.h"

src/glx/x11/drisw_glx.c

@@ -24,7 +24,6 @@
 #ifdef GLX_DIRECT_RENDERING
 
 #include <X11/Xlib.h>
-#include "glheader.h"
 #include "glxclient.h"
 #include "glcontextmodes.h"
 #include <dlfcn.h>

src/glx/x11/glx_pbuffer.c

@@ -38,7 +38,6 @@
 #include "glapi.h"
 #include "glxextensions.h"
 #include "glcontextmodes.h"
-#include "glheader.h"
 
 
 /**

src/glx/x11/glxclient.h

@@ -68,6 +68,23 @@
 
 #include "glxextensions.h"
 
+
+/* If we build the library with gcc's -fvisibility=hidden flag, we'll
+ * use the PUBLIC macro to mark functions that are to be exported.
+ *
+ * We also need to define a USED attribute, so the optimizer doesn't 
+ * inline a static function that we later use in an alias. - ajax
+ */
+#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+#  define PUBLIC __attribute__((visibility("default")))
+#  define USED __attribute__((used))
+#else
+#  define PUBLIC
+#  define USED
+#endif
+
+
+
 #define GLX_MAJOR_VERSION	1	/* current version numbers */
 #define GLX_MINOR_VERSION	4
 

src/glx/x11/glxcmds.c

@@ -43,7 +43,6 @@
 #include "glapi.h"
 #include "glxextensions.h"
 #include "glcontextmodes.h"
-#include "glheader.h"
 
 #ifdef GLX_DIRECT_RENDERING
 #include <sys/time.h>

src/glx/x11/glxcurrent.c

@@ -40,7 +40,6 @@
 
 #include "glxclient.h"
 #include "glapi.h"
-#include "glheader.h"
 #include "indirect_init.h"
 
 #ifdef GLX_DIRECT_RENDERING

src/glx/x11/glxext.c

@@ -44,13 +44,13 @@
  * \author Kevin E. Martin <kevin@precisioninsight.com>
  */     
 
+#include <assert.h>
 #include "glxclient.h"
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 #include "glapi.h"
 #include "glxextensions.h"
 #include "glcontextmodes.h"
-#include "glheader.h"
 
 #ifdef USE_XCB
 #include <X11/Xlib-xcb.h>

src/glx/x11/glxextensions.c

@@ -34,7 +34,7 @@
 #include <string.h>
 #include "glapi.h"
 #include "glxextensions.h"
-#include "simple_list.h"
+
 
 #define SET_BIT(m,b)   (m[ (b) / 8 ] |=  (1U << ((b) % 8)))
 #define CLR_BIT(m,b)   (m[ (b) / 8 ] &= ~(1U << ((b) % 8)))

src/glx/x11/indirect_vertex_program.c

@@ -23,7 +23,6 @@
  * SOFTWARE.
  */
 
-#include "glheader.h"
 #include <inttypes.h>
 #include <GL/gl.h>
 #include "indirect.h"

src/glx/x11/pixelstore.c

@@ -34,7 +34,6 @@
 **
 */
 
-#include "glheader.h"
 #include "glxclient.h"
 #include "indirect.h"
 

src/glx/x11/singlepix.c

@@ -34,7 +34,6 @@
 **
 */
 
-#include "glheader.h"
 #include "packsingle.h"
 #include "indirect.h"
 #include "dispatch.h"