JavaScriptCore-1097.3.3.tar.gz

[apple/javascriptcore.git] / API / JSBase.h

diff --git a/API/JSBase.h b/API/JSBase.h
index 2e16720cebb18a822179b9ae3fded3d069161315..fed54fe23ef340594b8d17eaf668c11e18675cae 100644 (file)
--- a/API/JSBase.h
+++ b/API/JSBase.h
@@ -63,20 +63,26 @@ typedef const struct OpaqueJSValue* JSValueRef;
 typedef struct OpaqueJSValue* JSObjectRef;
 
 /* JavaScript symbol exports */
 typedef struct OpaqueJSValue* JSObjectRef;
 
 /* JavaScript symbol exports */

+/* These rules should stay the same as in WebKit2/Shared/API/c/WKBase.h */

 
 #undef JS_EXPORT
 #if defined(JS_NO_EXPORT)
 
 #undef JS_EXPORT
 #if defined(JS_NO_EXPORT)

-    #define JS_EXPORT
+#define JS_EXPORT

 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)

-    #define JS_EXPORT __attribute__((visibility("default")))
-#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE)
-    #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
-        #define JS_EXPORT __declspec(dllexport)
-    #else
-        #define JS_EXPORT __declspec(dllimport)
-    #endif
+#define JS_EXPORT __attribute__((visibility("default")))
+#elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__)
+#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
+#define JS_EXPORT __declspec(dllexport)

 #else
 #else

-    #define JS_EXPORT
+#define JS_EXPORT __declspec(dllimport)
+#endif
+#else /* !defined(JS_NO_EXPORT) */
+#define JS_EXPORT
+#endif /* defined(JS_NO_EXPORT) */
+
+/* JS tests uses WTF but has no config.h, so we need to set the export defines here. */
+#ifndef WTF_EXPORT_PRIVATE
+#define WTF_EXPORT_PRIVATE JS_EXPORT

 #endif
 
 #ifdef __cplusplus
 #endif
 
 #ifdef __cplusplus