Changeset 206270 in webkit

Timestamp:

Sep 22, 2016 1:48:55 PM (8 years ago)

Author:

bshafiei@apple.com

Message:

Merge r206027. rdar://problem/28366812

Location:

branches/safari-602-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformWin.cmake (modified) (2 diffs)

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-22  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r206027. rdar://problem/28366812
+
+    2016-09-16  Per Arne Vollan  <pvollan@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  <bshafiei@apple.com>
 

branches/safari-602-branch/Source/WebCore/PlatformWin.cmake

@@ -2 +2 @@
 
 list(APPEND WebCore_INCLUDE_DIRECTORIES
+    "${WEBCORE_DIR}/ForwardingHeaders"
     "${CMAKE_BINARY_DIR}/../include/private"
     "${CMAKE_BINARY_DIR}/../include/private/JavaScriptCore"
@@ -25 +26 @@
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore/yarr"
     "${DERIVED_SOURCES_DIR}/ForwardingHeaders/WTF"
-    "${WEBCORE_DIR}/ForwardingHeaders"
     "${WEBCORE_DIR}/accessibility/win"
     "${WEBCORE_DIR}/page/win"