From: Vinson Lee <vlee@freedesktop.org>
Date: Sat, 19 Oct 2013 00:40:40 +0000 (-0700)
Subject: mesa: Remove GLXContextID typedef from glx.h.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=136a12ac98868d82c2ae9fcc80d11044a7ec56d1;p=mesa.git

mesa: Remove GLXContextID typedef from glx.h.

Fixes this build error.

  CC     clientattrib.lo
In file included from ../../include/GL/glx.h:333,
                 from glxclient.h:45,
                 from clientattrib.c:32:
../../include/GL/glxext.h:275: error: redefinition of typedef ‘GLXContextID’
../../include/GL/glx.h:171: 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>
---

diff --git a/include/GL/glx.h b/include/GL/glx.h
index 87c31fdcc15..fa5a8eda962 100644
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -168,7 +168,6 @@ typedef XID GLXDrawable;
 /* GLX 1.3 and later */
 typedef struct __GLXFBConfigRec *GLXFBConfig;
 typedef XID GLXFBConfigID;
-typedef XID GLXContextID;
 typedef XID GLXWindow;
 typedef XID GLXPbuffer;