Changeset 206027 in webkit

Timestamp:

Sep 16, 2016 9:40:43 AM (8 years ago)

Author:

pvollan@apple.com

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.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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  Chris Dumez  <cdumez@apple.com>
 

trunk/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"