Merge pull request #183 from c0d1f1ed/gl-gles-now-kiss
Fix conflicting type declarations in GL and GLES
diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index 5d3c00f..0f2ebca 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h
@@ -613,9 +613,9 @@
#ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1
-#include <stddef.h>
-typedef ptrdiff_t GLsizeiptr;
-typedef ptrdiff_t GLintptr;
+#include <KHR/khrplatform.h>
+typedef khronos_ssize_t GLsizeiptr;
+typedef khronos_intptr_t GLintptr;
#define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765
#define GL_QUERY_COUNTER_BITS 0x8864
diff --git a/api/GL/glext.h b/api/GL/glext.h
index f226335..d061f7c 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20180316
+#define GL_GLEXT_VERSION 20180328
/* Generated C header for:
* API: gl
@@ -464,9 +464,9 @@
#ifndef GL_VERSION_1_5
#define GL_VERSION_1_5 1
-#include <stddef.h>
-typedef ptrdiff_t GLsizeiptr;
-typedef ptrdiff_t GLintptr;
+#include <KHR/khrplatform.h>
+typedef khronos_ssize_t GLsizeiptr;
+typedef khronos_intptr_t GLintptr;
#define GL_BUFFER_SIZE 0x8764
#define GL_BUFFER_USAGE 0x8765
#define GL_QUERY_COUNTER_BITS 0x8864
@@ -4713,6 +4713,7 @@
#ifndef GL_ARB_vertex_buffer_object
#define GL_ARB_vertex_buffer_object 1
+#include <stddef.h>
typedef ptrdiff_t GLsizeiptrARB;
typedef ptrdiff_t GLintptrARB;
#define GL_BUFFER_SIZE_ARB 0x8764
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index 2006ed5..90b89d1 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@
#include <GLES/glplatform.h>
-/* Generated on date 20180316 */
+/* Generated on date 20180328 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 36fb91f..15bc433 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20180316 */
+/* Generated on date 20180328 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index 2cf6b72..93e94a4 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20180316 */
+/* Generated on date 20180328 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index e8d7515..ba8e478 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20180316 */
+/* Generated on date 20180328 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index a88b29c..8c741cc 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20180316 */
+/* Generated on date 20180328 */
/* Generated C header for:
* API: gles2
diff --git a/xml/gl.xml b/xml/gl.xml
index 9b27342..0bd1a31 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -95,8 +95,8 @@
<type>typedef unsigned short <name>GLhalfARB</name>;</type>
<type>typedef unsigned short <name>GLhalf</name>;</type>
<type comment="Must be 32 bits">typedef GLint <name>GLfixed</name>;</type>
- <type requires="stddef">typedef ptrdiff_t <name>GLintptr</name>;</type>
- <type requires="stddef">typedef ptrdiff_t <name>GLsizeiptr</name>;</type>
+ <type requires="khrplatform">typedef khronos_intptr_t <name>GLintptr</name>;</type>
+ <type requires="khrplatform">typedef khronos_ssize_t <name>GLsizeiptr</name>;</type>
<type requires="inttypes">typedef int64_t <name>GLint64</name>;</type>
<type requires="inttypes">typedef uint64_t <name>GLuint64</name>;</type>
<type requires="stddef">typedef ptrdiff_t <name>GLintptrARB</name>;</type>
