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

4 files changed, 11 insertions, 6 deletions

diff --git a/make/stub_includes/win32/windows.h b/make/stub_includes/win32/windows.h
index f7b141e31..9958e6d3a 100644
--- a/make/stub_includes/win32/windows.h
+++ b/make/stub_includes/win32/windows.h
@@ -1,6 +1,9 @@
 /* Windows #defines and typedefs required for processing of extracts
    from WINGDI.H and jawt_md.h */
 
+#ifndef _WINDOWS_
+#define _WINDOWS_
+
 #define FAR
 #define WINBASEAPI
 #define WINGDIAPI
@@ -50,3 +53,4 @@ typedef HANDLE              HVIDEOOUTPUTDEVICENV;
 typedef HANDLE              HVIDEOINPUTDEVICENV;
 typedef HANDLE              HPVIDEODEV;
 
+#endif /* _WINDOWS_ */
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);
 
diff --git a/make/stub_includes/win32/wingdi_types.h b/make/stub_includes/win32/wingdi_types.h
index d23502cad..14210bf2f 100644
--- a/make/stub_includes/win32/wingdi_types.h
+++ b/make/stub_includes/win32/wingdi_types.h
@@ -9,7 +9,8 @@
  * Editions / Removals and a split (wingdi.h -> wingdi.h + wingdi_types.h + winwgl.h) were made by the JogAmp Community, 2010, 2012
  */
 
-#ifndef GDI_VERSION_1_X
+#ifndef GDI_TYPES_1_X
+#define GDI_TYPES_1_X
 
 typedef struct tagRECT {
     LONG left;
@@ -161,6 +162,6 @@ typedef struct tagPIXELFORMATDESCRIPTOR {
 #define OBJ_ENHMETAFILE 13
 #define OBJ_COLORSPACE 14
 
-#endif /*  GDI_VERSION_1_X */
+#endif /* GDI_TYPES_1_X */
 
 
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