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/GL/gl-platform.h | |
| 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/GL/gl-platform.h')
| -rw-r--r-- | make/stub_includes/opengl/GL/gl-platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/make/stub_includes/opengl/GL/gl-platform.h b/make/stub_includes/opengl/GL/gl-platform.h index d07fd92ce..d55410b0a 100644 --- a/make/stub_includes/opengl/GL/gl-platform.h +++ b/make/stub_includes/opengl/GL/gl-platform.h @@ -49,6 +49,7 @@ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #define WIN32_LEAN_AND_MEAN 1 #include <windows.h> +#undef WIN32_LEAN_AND_MEAN #endif /** |