Title: [186874] branches/safari-601.1-branch
Diff
Modified: branches/safari-601.1-branch/Source/_javascript_Core/API/JSBase.h (186873 => 186874)
--- branches/safari-601.1-branch/Source/_javascript_Core/API/JSBase.h 2015-07-15 23:57:46 UTC (rev 186873)
+++ branches/safari-601.1-branch/Source/_javascript_Core/API/JSBase.h 2015-07-16 00:06:58 UTC (rev 186874)
@@ -84,11 +84,6 @@
#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
extern "C" {
#endif
Modified: branches/safari-601.1-branch/Source/_javascript_Core/ChangeLog (186873 => 186874)
--- branches/safari-601.1-branch/Source/_javascript_Core/ChangeLog 2015-07-15 23:57:46 UTC (rev 186873)
+++ branches/safari-601.1-branch/Source/_javascript_Core/ChangeLog 2015-07-16 00:06:58 UTC (rev 186874)
@@ -1,3 +1,18 @@
+2015-07-15 Lucas Forschler <[email protected]>
+
+ Merge r186826
+
+ 2015-07-14 Anders Carlsson <[email protected]>
+
+ Assertions.h should include ExportMacros.h
+ https://bugs.webkit.org/show_bug.cgi?id=146948
+
+ Reviewed by Tim Horton.
+
+ Remove now unneeded WTF_EXPORT_PRIVATE define.
+
+ * API/JSBase.h:
+
2015-07-13 Babak Shafiei <[email protected]>
Merge r186777.
Modified: branches/safari-601.1-branch/Source/WTF/ChangeLog (186873 => 186874)
--- branches/safari-601.1-branch/Source/WTF/ChangeLog 2015-07-15 23:57:46 UTC (rev 186873)
+++ branches/safari-601.1-branch/Source/WTF/ChangeLog 2015-07-16 00:06:58 UTC (rev 186874)
@@ -1,3 +1,16 @@
+2015-07-15 Lucas Forschler <[email protected]>
+
+ Merge r186826
+
+ 2015-07-14 Anders Carlsson <[email protected]>
+
+ Assertions.h should include ExportMacros.h
+ https://bugs.webkit.org/show_bug.cgi?id=146948
+
+ Reviewed by Tim Horton.
+
+ * wtf/Assertions.h:
+
2015-07-12 Babak Shafiei <[email protected]>
Merge r186720.
Modified: branches/safari-601.1-branch/Source/WTF/wtf/Assertions.h (186873 => 186874)
--- branches/safari-601.1-branch/Source/WTF/wtf/Assertions.h 2015-07-15 23:57:46 UTC (rev 186873)
+++ branches/safari-601.1-branch/Source/WTF/wtf/Assertions.h 2015-07-16 00:06:58 UTC (rev 186874)
@@ -42,6 +42,7 @@
#include <stdarg.h>
#include <stdbool.h>
#include <stddef.h>
+#include <wtf/ExportMacros.h>
#ifdef NDEBUG
/* Disable ASSERT* macros in release mode. */
Modified: branches/safari-601.1-branch/Tools/ChangeLog (186873 => 186874)
--- branches/safari-601.1-branch/Tools/ChangeLog 2015-07-15 23:57:46 UTC (rev 186873)
+++ branches/safari-601.1-branch/Tools/ChangeLog 2015-07-16 00:06:58 UTC (rev 186874)
@@ -1,3 +1,18 @@
+2015-07-15 Lucas Forschler <[email protected]>
+
+ Merge r186826
+
+ 2015-07-14 Anders Carlsson <[email protected]>
+
+ Assertions.h should include ExportMacros.h
+ https://bugs.webkit.org/show_bug.cgi?id=146948
+
+ Reviewed by Tim Horton.
+
+ Remove now unneeded WTF_EXPORT_PRIVATE define.
+
+ * DumpRenderTree/cg/ImageDiffCG.cpp:
+
2015-07-09 Dewei Zhu <[email protected]>
Quick fix for run_benchmark script that AppKit.NSRunningApplication does not work properly
Modified: branches/safari-601.1-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp (186873 => 186874)
--- branches/safari-601.1-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2015-07-15 23:57:46 UTC (rev 186873)
+++ branches/safari-601.1-branch/Tools/DumpRenderTree/cg/ImageDiffCG.cpp 2015-07-16 00:06:58 UTC (rev 186874)
@@ -26,7 +26,6 @@
// FIXME: We need to be able to include these defines from a config.h somewhere.
#define JS_EXPORT_PRIVATE
-#define WTF_EXPORT_PRIVATE
#include <stdio.h>
#include <wtf/Platform.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
