diff options
author | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
commit | 3c204c4a20943586532ce477ced827d108f3b4b0 (patch) | |
tree | c9891fdc315c41cc90806634589231172572b2ba /mesalib/src/mapi/glapi/glapi_priv.h | |
parent | 73a26452133415b7e3bf54836d23995d59a7bac4 (diff) | |
parent | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (diff) | |
download | vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.gz vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.bz2 vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 28 June 2013
libXext mesa git update 29 June 20013
Diffstat (limited to 'mesalib/src/mapi/glapi/glapi_priv.h')
-rw-r--r-- | mesalib/src/mapi/glapi/glapi_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/glapi_priv.h b/mesalib/src/mapi/glapi/glapi_priv.h index 795e0a200..92925faac 100644 --- a/mesalib/src/mapi/glapi/glapi_priv.h +++ b/mesalib/src/mapi/glapi/glapi_priv.h @@ -40,8 +40,8 @@ #ifndef GL_OES_fixed_point typedef int GLfixed; -typedef int GLclampx; #endif +typedef int GLclampx; #ifndef GL_OES_EGL_image typedef void *GLeglImageOES; |