summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2013-12-29 23:19:36 -0800
committerCarl Worth <[email protected]>2014-01-02 15:57:41 -0800
commit347f1493320e1bc2194c70d4d66bfe2b5883bf1e (patch)
treeb06c5041a14614ba064206b0ea306b6d62f4c9ab /include
parent49c865180ac90ad8a10a4bc18143c58a8ed4931e (diff)
Revert "mesa: Remove GLXContextID typedef from glx.h."
This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1. According to belak51 on IRC, this commit broke Allegro, which would no longer compile. Applications apparently expect the GLXContextID typedef to exist in glx.h; removing it breaks them. A bit of searching around the internet revealed other complaints since upgrading to Mesa 10. Cc: "10.0" <[email protected]> (cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)
Diffstat (limited to 'include')
-rw-r--r--include/GL/glx.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/GL/glx.h b/include/GL/glx.h
index 62d0ede9e2b..234abc05025 100644
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
/* GLX 1.3 and later */
typedef struct __GLXFBConfigRec *GLXFBConfig;
typedef XID GLXFBConfigID;
+typedef XID GLXContextID;
typedef XID GLXWindow;
typedef XID GLXPbuffer;