Title: [206270] branches/safari-602-branch/Source/WebCore
- Revision
- 206270
- Author
- bshaf...@apple.com
- Date
- 2016-09-22 13:48:55 -0700 (Thu, 22 Sep 2016)
Log Message
Merge r206027. rdar://problem/28366812
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (206269 => 206270)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-22 20:47:46 UTC (rev 206269)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-09-22 20:48:55 UTC (rev 206270)
@@ -1,3 +1,19 @@
+2016-09-22 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r206027. rdar://problem/28366812
+
+ 2016-09-16 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Compile fix.
+ https://bugs.webkit.org/show_bug.cgi?id=162059
+
+ Reviewed by Alex Christensen.
+
+ If an include file exists in two places in the include paths, we can end up including the file twice,
+ since #pragma once will not protect us against this.
+
+ * PlatformWin.cmake: Put WebCore forwarding folder first in include list.
+
2016-09-16 Babak Shafiei <bshaf...@apple.com>
Merge r206006. rdar://problem/27991573
Modified: branches/safari-602-branch/Source/WebCore/PlatformWin.cmake (206269 => 206270)
--- branches/safari-602-branch/Source/WebCore/PlatformWin.cmake 2016-09-22 20:47:46 UTC (rev 206269)
+++ branches/safari-602-branch/Source/WebCore/PlatformWin.cmake 2016-09-22 20:48:55 UTC (rev 206270)
@@ -1,6 +1,7 @@
add_definitions(/bigobj)
list(APPEND WebCore_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/ForwardingHeaders"
"${CMAKE_BINARY_DIR}/../include/private"
"${CMAKE_BINARY_DIR}/../include/private/_javascript_Core"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE"
@@ -24,7 +25,6 @@
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/runtime"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/_javascript_Core/yarr"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF"
- "${WEBCORE_DIR}/ForwardingHeaders"
"${WEBCORE_DIR}/accessibility/win"
"${WEBCORE_DIR}/page/win"
"${WEBCORE_DIR}/platform/cf"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
