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/win32/winwgl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'make/stub_includes/win32/winwgl.h') diff --git a/make/stub_includes/win32/winwgl.h b/make/stub_includes/win32/winwgl.h index c0dfb9bdb..cc0589574 100644 --- a/make/stub_includes/win32/winwgl.h +++ b/make/stub_includes/win32/winwgl.h @@ -9,10 +9,10 @@ * Editions / Removals and a split (wingdi.h -> wingdi.h + wingdi_types.h + winwgl.h) were made by the JogAmp Community, 2010, 2012 */ -#include "wingdi_types.h" - #ifndef WGL_GDI_VERSION_1_X +#include "wingdi_types.h" + /* layer types */ #define WGL_SWAP_MAIN_PLANE 1 #define WGL_SWAP_OVERLAY1 2 -- cgit v1.2.3