Mesa (master): mesa: Remove GLXContextID typedef from glxext.h.

Vinson Lee vlee at kemper.freedesktop.org
Mon Jan 6 22:58:48 UTC 2014


Module: Mesa
Branch: master
Commit: f8432832a7f3d3cc01f8bab8358069029d575ef0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f8432832a7f3d3cc01f8bab8358069029d575ef0

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Mon Jan  6 12:09:29 2014 -0800

mesa: Remove GLXContextID typedef from glxext.h.

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 at freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 include/GL/glxext.h |    1 -
 1 file changed, 1 deletion(-)

diff --git a/include/GL/glxext.h b/include/GL/glxext.h
index cfabe8c..7132385 100644
--- a/include/GL/glxext.h
+++ b/include/GL/glxext.h
@@ -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




More information about the mesa-commit mailing list