Title: [206027] trunk/Source/WebCore
- Revision
- 206027
- Author
- pvol...@apple.com
- Date
- 2016-09-16 09:40:43 -0700 (Fri, 16 Sep 2016)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206026 => 206027)
--- trunk/Source/WebCore/ChangeLog 2016-09-16 16:32:34 UTC (rev 206026)
+++ trunk/Source/WebCore/ChangeLog 2016-09-16 16:40:43 UTC (rev 206027)
@@ -1,3 +1,15 @@
+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 Chris Dumez <cdu...@apple.com>
Cloning a textarea does not clone the textarea's value
Modified: trunk/Source/WebCore/PlatformWin.cmake (206026 => 206027)
--- trunk/Source/WebCore/PlatformWin.cmake 2016-09-16 16:32:34 UTC (rev 206026)
+++ trunk/Source/WebCore/PlatformWin.cmake 2016-09-16 16:40:43 UTC (rev 206027)
@@ -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
