Title: [186735] branches/safari-601.1-branch/Source/WTF
- Revision
- 186735
- Author
- [email protected]
- Date
- 2015-07-12 00:29:37 -0700 (Sun, 12 Jul 2015)
Log Message
Merged r186720. rdar://problem/21221902
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WTF/ChangeLog (186734 => 186735)
--- branches/safari-601.1-branch/Source/WTF/ChangeLog 2015-07-12 07:28:21 UTC (rev 186734)
+++ branches/safari-601.1-branch/Source/WTF/ChangeLog 2015-07-12 07:29:37 UTC (rev 186735)
@@ -1,3 +1,13 @@
+2015-07-12 Babak Shafiei <[email protected]>
+
+ Merge r186720.
+
+ 2015-07-11 Joseph Pecoraro <[email protected]>
+
+ Unreviewed build fix, restrict APP_LINKS to just iOS.
+
+ * wtf/Platform.h:
+
2015-07-10 Matthew Hanson <[email protected]>
Disable non-shipping features.
Modified: branches/safari-601.1-branch/Source/WTF/wtf/Platform.h (186734 => 186735)
--- branches/safari-601.1-branch/Source/WTF/wtf/Platform.h 2015-07-12 07:28:21 UTC (rev 186734)
+++ branches/safari-601.1-branch/Source/WTF/wtf/Platform.h 2015-07-12 07:29:37 UTC (rev 186735)
@@ -555,7 +555,7 @@
#define USE_WEB_THREAD 1
#define USE_QUICK_LOOK 1
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
+#if defined(TARGET_OS_IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
#define HAVE_APP_LINKS 1
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
