egl: Windows updates to the platform.h files
authorJonathan White <jwhite@tungstengraphics.com>
Fri, 27 Jun 2008 13:13:30 +0000 (07:13 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Fri, 27 Jun 2008 13:13:58 +0000 (07:13 -0600)
include/GLES/glplatform.h
include/GLES2/gl2platform.h

index afbec74ea5f5b4314c10643ed450c907ed44fe6e..5ce0cbe84a2b2091c2339946f39e509cc2c78bc2 100644 (file)
@@ -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
index 62798c34fe29c70cb014b2e73e1bbcbc65d61b34..077571e4eaa823db8c621fb9ca45478582c432a2 100644 (file)
@@ -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
 }