diff options
author | Ian <IanFromAfrica@yahoo.co.uk> | 2011-06-08 10:40:17 (GMT) |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-06-20 06:06:54 (GMT) |
commit | 6d1bb2792df9bf16c0388e315f25e37308eec337 (patch) | |
tree | b001ee3ff31d0809e2c3429a9dfe05626cc559bc /src/gui/egl | |
parent | 5d5b6c79ab91d9d78e8e0ea5b5949dae3f8bf51c (diff) | |
download | Qt-6d1bb2792df9bf16c0388e315f25e37308eec337.zip Qt-6d1bb2792df9bf16c0388e315f25e37308eec337.tar.gz Qt-6d1bb2792df9bf16c0388e315f25e37308eec337.tar.bz2 |
Don't redefine EGL defines
Reviewed-by: Jørgen Lind
Diffstat (limited to 'src/gui/egl')
-rw-r--r-- | src/gui/egl/qegl_p.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index 9b0d82e..15e7cab 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -165,13 +165,21 @@ typedef int EGLImageKHR; typedef void *EGLImageKHR; #endif +#if !defined(EGL_NO_IMAGE_KHR) #define EGL_NO_IMAGE_KHR ((EGLImageKHR)0) +#endif +#if !defined(EGL_IMAGE_PRESERVED_KHR) #define EGL_IMAGE_PRESERVED_KHR 0x30D2 +#endif +#if !defined(EGL_KHR_image_base) #define EGL_KHR_image_base #endif +#endif -#if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_pixmap) +#if !defined(EGL_KHR_image) #define EGL_NATIVE_PIXMAP_KHR 0x30B0 +#endif +#if !defined(EGL_KHR_image_pixmap) #define EGL_KHR_image_pixmap #endif |