Title: [179907] trunk/Source/WebCore
- Revision
- 179907
- Author
- commit-qu...@webkit.org
- Date
- 2015-02-10 17:42:19 -0800 (Tue, 10 Feb 2015)
Log Message
Unreviewed, rolling out r179896.
https://bugs.webkit.org/show_bug.cgi?id=141452
broke linking debug builds (Requested by thorton on #webkit).
Reverted changeset:
"Stop using WebCore.exp.in on Mac and iOS."
https://bugs.webkit.org/show_bug.cgi?id=141413
http://trac.webkit.org/changeset/179896
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (179906 => 179907)
--- trunk/Source/WebCore/ChangeLog 2015-02-11 01:33:24 UTC (rev 179906)
+++ trunk/Source/WebCore/ChangeLog 2015-02-11 01:42:19 UTC (rev 179907)
@@ -1,3 +1,16 @@
+2015-02-10 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r179896.
+ https://bugs.webkit.org/show_bug.cgi?id=141452
+
+ broke linking debug builds (Requested by thorton on #webkit).
+
+ Reverted changeset:
+
+ "Stop using WebCore.exp.in on Mac and iOS."
+ https://bugs.webkit.org/show_bug.cgi?id=141413
+ http://trac.webkit.org/changeset/179896
+
2015-02-10 Alex Christensen <achristen...@webkit.org>
Fix bindings tests after r179886.
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (179906 => 179907)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2015-02-11 01:33:24 UTC (rev 179906)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2015-02-11 01:42:19 UTC (rev 179907)
@@ -56,7 +56,6 @@
GCC_MODEL_TUNING[sdk=macosx*] = G5;
GCC_OBJC_CALL_CXX_CDTORS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
-GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_THREADSAFE_STATICS = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
Modified: trunk/Source/WebCore/platform/PlatformExportMacros.h (179906 => 179907)
--- trunk/Source/WebCore/platform/PlatformExportMacros.h 2015-02-11 01:33:24 UTC (rev 179906)
+++ trunk/Source/WebCore/platform/PlatformExportMacros.h 2015-02-11 01:42:19 UTC (rev 179907)
@@ -32,20 +32,41 @@
#include <wtf/Platform.h>
#include <wtf/ExportMacros.h>
+#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) || \
+ defined(STATICALLY_LINKED_WITH_WebCore) || defined(STATICALLY_LINKED_WITH_WebKit)
+#define WEBCORE_IS_LINKED_IN_SAME_BINARY 1
+#endif
+
// See note in wtf/Platform.h for more info on EXPORT_MACROS.
#if USE(EXPORT_MACROS)
-// FIXME: Get rid of WebKitExports.def.in and make this work on Windows.
-#if !PLATFORM(WIN)
-#define WEBCORE_EXPORT WTF_EXPORT
+#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
+#define WEBKIT_EXPORTDATA WTF_EXPORT
#else
-#define WEBCORE_EXPORT
+#define WEBKIT_EXPORTDATA WTF_IMPORT
#endif
+// FIXME: This should be WTF_EXPORT once WEBCORE_EXPORT is used instead of WebCore.exp.in.
+#define WEBCORE_EXPORT
+
#else // !USE(EXPORT_MACROS)
#define WEBCORE_EXPORT
+#if OS(WINDOWS) && !COMPILER(GCC)
+
+#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
+#define WEBKIT_EXPORTDATA __declspec(dllexport)
+#else
+#define WEBKIT_EXPORTDATA __declspec(dllimport)
+#endif
+
+#else // !PLATFORM...
+
+#define WEBKIT_EXPORTDATA
+
+#endif // !PLATFORM...
+
#endif // USE(EXPORT_MACROS)
#endif // PlatformExportMacros_h
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
