diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-04 13:44:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-04 13:44:39 +0200 |
| commit | 2433c3693663c0ace48aee718c10a6b78207b7cf (patch) | |
| tree | 8c569c4af28c0e365d64d432957b20c9aa0b4953 /mesalib/include | |
| parent | fadba36545cbab5859bf346921bf416d0160a5b2 (diff) | |
| parent | 2ecad38adbeaa652daaab8f2a6d112921b7e74eb (diff) | |
| download | vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.tar.gz vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.tar.bz2 vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa libxcb git update 4 jul 2013
Diffstat (limited to 'mesalib/include')
| -rw-r--r-- | mesalib/include/EGL/eglplatform.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/include/EGL/eglplatform.h b/mesalib/include/EGL/eglplatform.h index 17fdc6114..21b18fe73 100644 --- a/mesalib/include/EGL/eglplatform.h +++ b/mesalib/include/EGL/eglplatform.h @@ -109,8 +109,8 @@ typedef void *EGLNativeDisplayType; #ifdef MESA_EGL_NO_X11_HEADERS typedef void *EGLNativeDisplayType; -typedef khronos_uint32_t EGLNativePixmapType; -typedef khronos_uint32_t EGLNativeWindowType; +typedef khronos_uintptr_t EGLNativePixmapType; +typedef khronos_uintptr_t EGLNativeWindowType; #else |