From 9766fe68c339f4a82524c7091063ae04231058cb Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 5 Aug 2004 16:54:08 +0000
Subject: [PATCH] respect old versions of glx.h a little better

---
 panda/src/glxdisplay/glxGraphicsPipe.h | 1 -
 panda/src/glxdisplay/glxext.h          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/panda/src/glxdisplay/glxGraphicsPipe.h b/panda/src/glxdisplay/glxGraphicsPipe.h
index 10dcdca7de..1b749d8dd8 100644
--- a/panda/src/glxdisplay/glxGraphicsPipe.h
+++ b/panda/src/glxdisplay/glxGraphicsPipe.h
@@ -55,7 +55,6 @@ typedef int XIC;
 #if !defined(HAVE_GLXFBCONFIG) && defined(GLX_SGIX_fbconfig) && defined(GLX_SGIX_pbuffer)
   // If the system glx version isn't 1.3, but these were defined as
   // extensions, we can work with that.
-  #define GLX_RGBA_TYPE GLX_RGBA_TYPE_SGIX
   #define GLXFBConfig GLXFBConfigSGIX
   #define GLXPbuffer GLXPbufferSGIX
   #define glXChooseFBConfig glXChooseFBConfigSGIX
diff --git a/panda/src/glxdisplay/glxext.h b/panda/src/glxdisplay/glxext.h
index 036ab6a824..192227a3c4 100644
--- a/panda/src/glxdisplay/glxext.h
+++ b/panda/src/glxdisplay/glxext.h
@@ -332,6 +332,7 @@ typedef struct {
      the following to compile. */
 typedef struct __GLXFBConfigRec *GLXFBConfig;    
 typedef XID GLXPbuffer;
+typedef XID GLXWindow;
 
 #ifdef GLX_GLXEXT_PROTOTYPES
 extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);