diff options
| author | marha <marha@users.sourceforge.net> | 2014-01-05 17:18:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-01-05 17:18:15 +0100 |
| commit | 0fd65ec557757ec8760a96400a09b8a8a92a7b14 (patch) | |
| tree | 961d86d49281cf94e2dc85ffb88c6b1491036338 /mesalib/include | |
| parent | 68c12003597662f95eac07ddeee99637f7caa3e5 (diff) | |
| parent | 1b37f71714e2ca4af60bd050adbbb7969534dfd6 (diff) | |
| download | vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.gz vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.tar.bz2 vcxsrv-0fd65ec557757ec8760a96400a09b8a8a92a7b14.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto libXau libxcb mesa mkfontscale pixman git update 5 Jan 2014
Diffstat (limited to 'mesalib/include')
| -rw-r--r-- | mesalib/include/GL/glx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/include/GL/glx.h b/mesalib/include/GL/glx.h index 62d0ede9e..234abc050 100644 --- a/mesalib/include/GL/glx.h +++ b/mesalib/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; |