Title: [212864] tags/Safari-604.1.7/Source/WTF
- Revision
- 212864
- Author
- jmarc...@apple.com
- Date
- 2017-02-22 17:05:20 -0800 (Wed, 22 Feb 2017)
Log Message
Merge r212849.
Modified Paths
Diff
Modified: tags/Safari-604.1.7/Source/WTF/ChangeLog (212863 => 212864)
--- tags/Safari-604.1.7/Source/WTF/ChangeLog 2017-02-23 01:05:13 UTC (rev 212863)
+++ tags/Safari-604.1.7/Source/WTF/ChangeLog 2017-02-23 01:05:20 UTC (rev 212864)
@@ -1,5 +1,17 @@
2017-02-22 Jason Marcell <jmarc...@apple.com>
+ Merge r212849.
+
+ 2017-02-22 Alex Christensen <achristen...@webkit.org>
+
+ Re-commit part of r212812 accidentally rolled out with r212841.
+ https://bugs.webkit.org/show_bug.cgi?id=167293
+
+ * wtf/Platform.h:
+ Use libwebrtc on Mac if webrtc is enabled.
+
+2017-02-22 Jason Marcell <jmarc...@apple.com>
+
Merge r212841. rdar://problem/30352793
2017-02-22 Carlos Garcia Campos <cgar...@igalia.com>
Modified: tags/Safari-604.1.7/Source/WTF/wtf/Platform.h (212863 => 212864)
--- tags/Safari-604.1.7/Source/WTF/wtf/Platform.h 2017-02-23 01:05:13 UTC (rev 212863)
+++ tags/Safari-604.1.7/Source/WTF/wtf/Platform.h 2017-02-23 01:05:20 UTC (rev 212864)
@@ -1208,4 +1208,8 @@
#endif
#endif /* PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101201 && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 */
+#if PLATFORM(MAC) && ENABLE(WEB_RTC)
+#define USE_LIBWEBRTC 1
+#endif
+
#endif /* WTF_Platform_h */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
