From 0674a3678d747335ad36f0f57e3bdc9c168f0dcf Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 6 Mar 2015 09:42:13 +0100 Subject: 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 --- make/stub_includes/opengl/GL/gl-platform.h | 1 + 1 file changed, 1 insertion(+) (limited to 'make/stub_includes/opengl/GL/gl-platform.h') 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 +#undef WIN32_LEAN_AND_MEAN #endif /** -- cgit v1.2.3