aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2015-03-06 09:38:16 +0100
committerSven Gothel <sgothel@jausoft.com>2015-03-06 09:38:16 +0100
commita554616fae30facd7574679b5c8b244757b7ccd9 (patch)
tree95e9752e85d44749fbf71975cc66d6dbd769c439 /make
parent47713518e3317b2621ee7ff1bbf8223fbce7fdc4 (diff)
Bug 1135 - Support EGL 1.5 , ES 3.1 and GL 4.5 - Part 3: Minimal patch of vanilla GL headers (Fix last patch)
Last patch of vanilla header, commit 47713518e3317b2621ee7ff1bbf8223fbce7fdc4, added gl-types.h include, which causes 'redefined' warnings or errors. Removed. - GL/glcorearb.h 2015-02-02 - #include "gl-types.h" - GL/glext.h 2015-02-02 - #include "gl-types.h"
Diffstat (limited to 'make')
-rw-r--r--make/stub_includes/opengl/GL/glcorearb.h1
-rw-r--r--make/stub_includes/opengl/GL/glext.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/make/stub_includes/opengl/GL/glcorearb.h b/make/stub_includes/opengl/GL/glcorearb.h
index 238dc6818..e5df49155 100644
--- a/make/stub_includes/opengl/GL/glcorearb.h
+++ b/make/stub_includes/opengl/GL/glcorearb.h
@@ -38,7 +38,6 @@ extern "C" {
/* Function declaration macros - to move into gl-platform.h */
#include "gl-platform.h"
-#include "gl-types.h"
/* glcorearb.h is for use with OpenGL core profile implementations.
** It should should be placed in the same directory as gl.h and
diff --git a/make/stub_includes/opengl/GL/glext.h b/make/stub_includes/opengl/GL/glext.h
index 056abbd93..4222b20f4 100644
--- a/make/stub_includes/opengl/GL/glext.h
+++ b/make/stub_includes/opengl/GL/glext.h
@@ -38,7 +38,6 @@ extern "C" {
/* Function declaration macros - to move into gl-platform.h */
#include "gl-platform.h"
-#include "gl-types.h"
#define GL_GLEXT_VERSION 20150202