3 files changed, 13 insertions, 5 deletions
diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h
index 39aa414..34d06ac 100644
--- a/third_party/khronos/GLES2/gl2.h
+++ b/third_party/khronos/GLES2/gl2.h
@@ -486,8 +486,6 @@ 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 ad13aa3..60b8566 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 void GL_APIENTRY glEnableFeatureCHROMIUM (const GLchar *feature);
+GL_APICALL GLboolean 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 c9fa3c4..f1c8520 100644
--- a/third_party/khronos/GLES2/gl2platform.h
+++ b/third_party/khronos/GLES2/gl2platform.h
@@ -19,8 +19,18 @@
 
 #include <KHR/khrplatform.h>
 
-#ifndef GL_APICALL
-#define GL_APICALL  KHRONOS_APICALL
+#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
 #endif
 
 #ifndef GL_APIENTRY