summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan White <jwhite@tungstengraphics.com>2008-06-27 07:13:30 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-06-27 07:13:58 -0600
commitb028b0cc533b4e10cdf599e49731e3c30fb0e366 (patch)
treebabc2288102f2fbc7e4fe5b8e7c4e46242e3d2f6
parent5b9d823545ec588ea97cc599a278626b99430d81 (diff)
egl: Windows updates to the platform.h files
-rw-r--r--include/GLES/glplatform.h3
-rw-r--r--include/GLES2/gl2platform.h23
2 files changed, 11 insertions, 15 deletions
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
}