make GLES/glext.hpp guard macro name unique

We want to include both GL/glext.hpp and GLES/glext.hpp but they are
guarded using the same macro name. Make them unique.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: José Fonseca <jose.r.fonseca@gmail.com>

diff --git a/thirdparty/khronos/GLES/glext.h b/thirdparty/khronos/GLES/glext.h
index d591832bf86646c7b7e5c68576ad0ca99fe6d6a4..90fd2c363bd434433db226662baf44ef4e0c9ab8 100644 (file)
--- a/thirdparty/khronos/GLES/glext.h
+++ b/thirdparty/khronos/GLES/glext.h
@@ -1,5 +1,5 @@
-#ifndef __glext_h_
-#define __glext_h_
+#ifndef __gles_glext_h_
+#define __gles_glext_h_
 
 /* $Revision: 16481 $ on $Date:: 2012-01-04 10:43:56 -0800 #$ */
 
@@ -1179,5 +1179,5 @@ typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask);
 }
 #endif
 
-#endif /* __glext_h_ */
+#endif /* __gles_glext_h_ */
 

diff --git a/thirdparty/khronos/GLES/glext.patch b/thirdparty/khronos/GLES/glext.patch
new file mode 100644 (file)
index 0000000..64ab153
--- /dev/null
+++ b/thirdparty/khronos/GLES/glext.patch
@@ -0,0 +1,19 @@
+diff --git a/thirdparty/khronos/GLES/glext.h b/thirdparty/khronos/GLES/glext.h
+index d591832..90fd2c3 100644
+--- a/thirdparty/khronos/GLES/glext.h
++++ b/thirdparty/khronos/GLES/glext.h
+@@ -1,5 +1,5 @@
+-#ifndef __glext_h_
+-#define __glext_h_
++#ifndef __gles_glext_h_
++#define __gles_glext_h_
+ 
+ /* $Revision: 16481 $ on $Date:: 2012-01-04 10:43:56 -0800 #$ */
+ 
+@@ -1179,5 +1179,5 @@ typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask);
+ }
+ #endif
+ 
+-#endif /* __glext_h_ */
++#endif /* __gles_glext_h_ */
+ 

diff --git a/thirdparty/khronos/Makefile b/thirdparty/khronos/Makefile
index b53d5f5478433cf01e9cfe456345cd6f0f31f7e9..9240ca826ee7749c576304414eb67282df67cf1a 100644 (file)
--- a/thirdparty/khronos/Makefile
+++ b/thirdparty/khronos/Makefile
@@ -27,9 +27,13 @@ EGL/eglplatform.h: EGL/eglplatform.patch FORCE
        wget -O $@ "http://www.khronos.org/registry/egl/api/$@"
        patch $@ $<
 
-GLES/gl.h GLES/glext.h GLES/glplatform.h: FORCE
+GLES/gl.h GLES/glplatform.h: FORCE
        wget -O $@ "http://www.khronos.org/registry/gles/api/1.1/$(@F)"
 
+GLES/glext.h: GLES/glext.patch FORCE
+       wget -O $@ "http://www.khronos.org/registry/gles/api/1.1/$(@F)"
+       patch $@ $<
+
 GLES2/gl2.h GLES2/gl2ext.h GLES2/gl2platform.h: FORCE
        wget -O $@ "http://www.khronos.org/registry/gles/api/2.0/$(@F)"