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/win32/wingdi.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/win32/wingdi.h')
-rw-r--r-- | make/stub_includes/win32/wingdi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/make/stub_includes/win32/wingdi.h b/make/stub_includes/win32/wingdi.h index e252b3b36..0fb042eb1 100644 --- a/make/stub_includes/win32/wingdi.h +++ b/make/stub_includes/win32/wingdi.h @@ -9,11 +9,11 @@ * 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 GDI_VERSION_1_X #define GDI_VERSION_1_X +#include "wingdi_types.h" + // Windows routines WINBASEAPI DWORD WINAPI GetLastError(VOID); |