mesa: Remove GLXContextID typedef from glxext.h.
authorVinson Lee <vlee@freedesktop.org>
Mon, 6 Jan 2014 20:09:29 +0000 (12:09 -0800)
committerVinson Lee <vlee@freedesktop.org>
Mon, 6 Jan 2014 22:57:23 +0000 (14:57 -0800)
This patch fixes this build error with gcc <= 4.5 and clang <= 3.1.

  CC     clientattrib.lo
In file included from ../../include/GL/glx.h:333:0,
                 from glxclient.h:45,
                 from clientattrib.c:32:
../../include/GL/glxext.h:275:13: error: redefinition of typedef 'GLXContextID'
../../include/GL/glx.h:171:13: note: previous declaration of 'GLXContextID' was here

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70591
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
include/GL/glxext.h

index cfabe8cc395a840072cc6b4a23600382b9c08c5d..713238519f6d1730f413b72bde6ad91dc0b21eb2 100644 (file)
@@ -272,7 +272,6 @@ __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *procName);
 
 #ifndef GLX_EXT_import_context
 #define GLX_EXT_import_context 1
-typedef XID GLXContextID;
 #define GLX_SHARE_CONTEXT_EXT             0x800A
 #define GLX_VISUAL_ID_EXT                 0x800B
 #define GLX_SCREEN_EXT                    0x800C