diff options
| author | Sven Gothel <[email protected]> | 2015-03-06 09:42:13 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-06 09:42:13 +0100 |
| commit | 0674a3678d747335ad36f0f57e3bdc9c168f0dcf (patch) | |
| tree | a6841c14fc41ca14586f684136fe792362094195 /make/stub_includes/opengl/GLES | |
| parent | a554616fae30facd7574679b5c8b244757b7ccd9 (diff) | |
Bug 1135 - Fix other GL header and windows-system header
- GL/gl.h: remove added gl-types.h include, which causes 'redefined' warnings or errors.
- GLES/glext.h: Use vanilla 'typedef void* GLeglImageOES'
- opengl/gl-types.h: Complete all GL types
- Fix windows.h and all its related header
Diffstat (limited to 'make/stub_includes/opengl/GLES')
| -rw-r--r-- | make/stub_includes/opengl/GLES/glext.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/make/stub_includes/opengl/GLES/glext.h b/make/stub_includes/opengl/GLES/glext.h index 7a0a718ca..4f4f071f1 100644 --- a/make/stub_includes/opengl/GLES/glext.h +++ b/make/stub_includes/opengl/GLES/glext.h @@ -65,8 +65,7 @@ extern "C" { /* GL_OES_EGL_image */ #ifndef GL_OES_EGL_image -// typedef void* GLeglImageOES; -typedef struct __GLeglImageOES *GLeglImageOES; +typedef void* GLeglImageOES; #endif /* GL_OES_EGL_image_external */ |