3 files changed, 5 insertions, 13 deletions
diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h
index 34d06ac..39aa414 100644
--- a/third_party/khronos/GLES2/gl2.h
+++ b/third_party/khronos/GLES2/gl2.h
@@ -486,6 +486,8 @@ typedef khronos_ssize_t  GLsizeiptr;
 /*-------------------------------------------------------------------------
  * GL core functions.
  *-----------------------------------------------------------------------*/
+#undef GL_APICALL
+#define GL_APICALL
 #undef GL_APIENTRY
 #define GL_APIENTRY
 
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h
index 60b8566..ad13aa3 100644
--- a/third_party/khronos/GLES2/gl2ext.h
+++ b/third_party/khronos/GLES2/gl2ext.h
@@ -1398,7 +1398,7 @@ typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUM) ();
 #ifdef GL_GLEXT_PROTOTYPES
 #define glEnableFeatureCHROMIUM GLES2_GET_FUN(EnableFeatureCHROMIUM)
 #if !defined(GLES2_USE_CPP_BINDINGS)
-GL_APICALL GLboolean GL_APIENTRY glEnableFeatureCHROMIUM (const GLchar *feature);
+GL_APICALL void GL_APIENTRY glEnableFeatureCHROMIUM (const GLchar *feature);
 #endif
 #else
 typedef void (GL_APIENTRYP PFNGLENABLEFEATURECHROMIUM) (const GLchar *feature);
diff --git a/third_party/khronos/GLES2/gl2platform.h b/third_party/khronos/GLES2/gl2platform.h
index f1c8520..c9fa3c4 100644
--- a/third_party/khronos/GLES2/gl2platform.h
+++ b/third_party/khronos/GLES2/gl2platform.h
@@ -19,18 +19,8 @@
 
 #include <KHR/khrplatform.h>
 
-#if defined(COMPONENT_BUILD)
-#if defined(WIN32)
-#if defined(GLES2_C_LIB_IMPLEMENTATION)
-#define GL_APICALL __declspec(dllexport)
-#else
-#define GL_APICALL __declspec(dllimport)
-#endif  /* defined(GLES2_C_LIB_IMPLEMENTATION) */
-#else /* defined(WIN32) */
-#define GL_APICALL __attribute__((visibility("default")))
-#endif
-#else
-#   define GL_APICALL
+#ifndef GL_APICALL
+#define GL_APICALL  KHRONOS_APICALL
 #endif
 
 #ifndef GL_APIENTRY