JavaScriptCore-1218.35.tar.gz

[apple/javascriptcore.git] / runtime / JSExportMacros.h

diff --git a/runtime/JSExportMacros.h b/runtime/JSExportMacros.h
index 884805f86b85290aabd0c79d0fa88b9061505c67..77e4b0a33bd2109ef31b2dc9d564487e57157d9d 100644 (file)
--- a/runtime/JSExportMacros.h
+++ b/runtime/JSExportMacros.h
@@ -36,7 +36,7 @@
 // See note in wtf/Platform.h for more info on EXPORT_MACROS.
 #if USE(EXPORT_MACROS)
 
-#if defined(BUILDING_JavaScriptCore)
+#if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore)
 #define JS_EXPORT_PRIVATE WTF_EXPORT
 #else
 #define JS_EXPORT_PRIVATE WTF_IMPORT
@@ -48,9 +48,9 @@
 
 #else // !USE(EXPORT_MACROS)
 
-#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
+#if OS(WINDOWS) && !COMPILER(GCC)
 
-#if defined(BUILDING_JavaScriptCore)
+#if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore)
 #define JS_EXPORTDATA __declspec(dllexport)
 #else
 #define JS_EXPORTDATA __declspec(dllimport)