3 files changed, 14 insertions, 16 deletions
diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
index 6a67a3d29ff..ab3b7398ca7 100644
--- a/include/EGL/eglplatform.h
+++ b/include/EGL/eglplatform.h
@@ -8,12 +8,14 @@
 /* Windows calling convention boilerplate */
 #if (defined(WIN32) || defined(_WIN32_WCE))
 #ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN		/* Exclude rarely-used stuff from Windows headers */
 #endif
 #include <windows.h>
 #endif
 
+#if !defined(_WIN32_WCE)
 #include <sys/types.h>
+#endif
 
 /* Macros used in EGL function prototype declarations.
  *
diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h
index afbec74ea5f..5ce0cbe84a2 100644
--- a/include/GLES/glplatform.h
+++ b/include/GLES/glplatform.h
@@ -45,14 +45,13 @@ extern "C" {
  * Definition of GL_API and GL_APIENTRY
  *-----------------------------------------------------------------------*/
 
-#define __GL_EXPORTS
-
 #ifdef _WIN32
 #   ifdef __GL_EXPORTS
 #       define GL_API __declspec(dllexport)
 #   else
 #       define GL_API __declspec(dllimport)
 #   endif
+#   define GLAPIENTRY __stdcall
 #else
 #   ifdef __GL_EXPORTS
 #       define GL_API
diff --git a/include/GLES2/gl2platform.h b/include/GLES2/gl2platform.h
index 62798c34fe2..077571e4eaa 100644
--- a/include/GLES2/gl2platform.h
+++ b/include/GLES2/gl2platform.h
@@ -45,25 +45,22 @@ extern "C" {
  * Definition of GL_APICALL and GL_APIENTRY
  *-----------------------------------------------------------------------*/
 
-#if defined(_WIN32) || defined(__VC32__)             /* Win32 */
-#   if defined (_DLL_EXPORTS)
+#ifdef _WIN32
+#   ifdef __GL_EXPORTS
 #       define GL_APICALL __declspec(dllexport)
 #   else
 #       define GL_APICALL __declspec(dllimport)
 #   endif
-#elif defined (__ARMCC_VERSION)                      /* ADS */
-#   define GL_APICALL
-#elif defined (__SYMBIAN32__) && defined (__GCC32__) /* Symbian GCC */
-#   define GL_APICALL __declspec(dllexport)
-#elif defined (__GNUC__)                             /* GCC dependencies (kludge) */
-#   define GL_APICALL
-#endif
-
-#if !defined (GL_APICALL)
-#   error Unsupported platform!
+#   define GLAPIENTRY __stdcall
+#else
+#   ifdef __GL_EXPORTS
+#       define GL_APICALL
+#   else
+#       define GL_APICALL extern
+#   endif
 #endif
 
-#define GL_APIENTRY
+#define GL_APIENTRY 
 
 #ifdef __cplusplus
 }