From: Chia-I Wu <olv@lunarg.com>
Date: Mon, 31 May 2010 03:03:48 +0000 (+0800)
Subject: Update KHRONOS_APICALL for _WIN32 platform.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=14f1157a2e52f14149cee7cf87cf3b32c6e439fb;p=mesa.git

Update KHRONOS_APICALL for _WIN32 platform.

Use __declspec(dllexport) when KHRONOS_DLL_EXPORTS is defined.
---

diff --git a/include/KHR/khrplatform.h b/include/KHR/khrplatform.h
index a4b88ebc3df..447953940e6 100644
--- a/include/KHR/khrplatform.h
+++ b/include/KHR/khrplatform.h
@@ -98,7 +98,11 @@
  * This precedes the return type of the function in the function prototype.
  */
 #if defined(_WIN32) && !defined(__SCITECH_SNAP__)
-#   define KHRONOS_APICALL __declspec(dllimport)
+#   if defined(KHRONOS_DLL_EXPORTS)
+#      define KHRONOS_APICALL __declspec(dllexport)
+#   else
+#      define KHRONOS_APICALL __declspec(dllimport)
+#   endif
 #elif defined (__SYMBIAN32__)
 #   define KHRONOS_APICALL IMPORT_C
 #elif (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
diff --git a/include/VG/vgplatform.h b/include/VG/vgplatform.h
index 2c626a971e1..71dee68b9d4 100644
--- a/include/VG/vgplatform.h
+++ b/include/VG/vgplatform.h
@@ -34,28 +34,17 @@
 #ifndef _VGPLATFORM_H
 #define _VGPLATFORM_H
 
+#include <KHR/khrplatform.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
-#  define VG_API_CALL __attribute__((visibility("default")))
-#  define VGU_API_CALL __attribute__((visibility("default")))
-#endif
-
 #ifndef VG_API_CALL 
 #if defined(OPENVG_STATIC_LIBRARY)
 #	define VG_API_CALL
 #else
-#	if defined(_WIN32) || defined(__VC32__)				/* Win32 */
-#		if defined (OPENVG_DLL_EXPORTS)
-#			define VG_API_CALL __declspec(dllexport)
-#		else
-#			define VG_API_CALL __declspec(dllimport)
-#		endif
-#	else 
-#		define VG_API_CALL extern
-#	endif /* defined(_WIN32) ||... */
+#	define VG_API_CALL KHRONOS_APICALL
 #endif /* defined OPENVG_STATIC_LIBRARY */
 #endif /* ifndef VG_API_CALL */
 
@@ -63,15 +52,7 @@ extern "C" {
 #if defined(OPENVG_STATIC_LIBRARY)
 #	define VGU_API_CALL
 #else
-#	if defined(_WIN32) || defined(__VC32__)				/* Win32 */
-#		if defined (OPENVG_DLL_EXPORTS)
-#			define VGU_API_CALL __declspec(dllexport)
-#		else
-#			define VGU_API_CALL __declspec(dllimport)
-#		endif
-#	else 
-#		define VGU_API_CALL extern
-#	endif /* defined(_WIN32) ||... */
+#	define VGU_API_CALL KHRONOS_APICALL
 #endif /* defined OPENVG_STATIC_LIBRARY */
 #endif /* ifndef VGU_API_CALL */