Title: [189127] trunk/Source/WTF
- Revision
- 189127
- Author
- ander...@apple.com
- Date
- 2015-08-28 15:46:34 -0700 (Fri, 28 Aug 2015)
Log Message
Remove the #if PLATFORM(MAC) in DeprecatedSymbolsUsedBySafari.mm so we'll actually build it on iOS.
Reviewed by Dan Bernstein.
* wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (189126 => 189127)
--- trunk/Source/WTF/ChangeLog 2015-08-28 22:38:41 UTC (rev 189126)
+++ trunk/Source/WTF/ChangeLog 2015-08-28 22:46:34 UTC (rev 189127)
@@ -1,3 +1,11 @@
+2015-08-28 Anders Carlsson <ander...@apple.com>
+
+ Remove the #if PLATFORM(MAC) in DeprecatedSymbolsUsedBySafari.mm so we'll actually build it on iOS.
+
+ Reviewed by Dan Bernstein.
+
+ * wtf/mac/DeprecatedSymbolsUsedBySafari.mm:
+
2015-08-27 Anders Carlsson <ander...@apple.com>
Define legacy main thread calling functions for iOS as well
Modified: trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm (189126 => 189127)
--- trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2015-08-28 22:38:41 UTC (rev 189126)
+++ trunk/Source/WTF/wtf/mac/DeprecatedSymbolsUsedBySafari.mm 2015-08-28 22:46:34 UTC (rev 189127)
@@ -25,8 +25,6 @@
#include "config.h"
-#if PLATFORM(MAC)
-
#include "Functional.h"
#include "HashMap.h"
#include "HashSet.h"
@@ -41,6 +39,7 @@
namespace WTF {
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
WTF_EXPORT_PRIVATE void callOnMainThread(const Function<void ()>&);
WTF_EXPORT_PRIVATE void lockAtomicallyInitializedStaticMutex();
WTF_EXPORT_PRIVATE void unlockAtomicallyInitializedStaticMutex();
@@ -61,8 +60,9 @@
{
atomicallyInitializedStaticMutex.unlock();
}
+#endif
-#if !((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101100) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 90000))
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
WTF_EXPORT_PRIVATE void callOnMainThread(void (*function)(void*), void* context);
WTF_EXPORT_PRIVATE void cancelCallOnMainThread(void (*function)(void*), void* context);
@@ -154,5 +154,3 @@
#endif
} // namespace WTF
-
-#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
