Changeset 128033 in webkit

Timestamp:

Sep 10, 2012 2:09:14 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2] Make WK2 C API headers compile in the Qt build on Windows
​https://bugs.webkit.org/show_bug.cgi?id=96246

Patch by Simon Hausmann <​simon.hausmann@nokia.com> on 2012-09-10
Reviewed by Kenneth Rohde Christiansen.

WKBase.h and WKAPICast.h include files that are specific to the Safari/Windows
port if WIN32 or _WIN32 is defined. When building WebKit2 on Windows with Qt, we
do not want to include these files, as they define an API that is different to ours
(the view aspect differs). Therefore guard the inclusion with !defined(BUILDING_QT)

• Shared/API/c/WKBase.h:
• UIProcess/API/C/WKAPICast.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/c/WKBase.h (modified) (1 diff)
• UIProcess/API/C/WKAPICast.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [WK2] Make WK2 C API headers compile in the Qt build on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=96246
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WKBase.h and WKAPICast.h include files that are specific to the Safari/Windows
+        port if WIN32 or _WIN32 is defined. When building WebKit2 on Windows with Qt, we
+        do not want to include these files, as they define an API that is different to ours
+        (the view aspect differs). Therefore guard the inclusion with !defined(BUILDING_QT__)
+
+        * Shared/API/c/WKBase.h:
+        * UIProcess/API/C/WKAPICast.h:
+
 2012-09-10  Kevin Funk  <kevin.funk@kdab.com>
 

trunk/Source/WebKit2/Shared/API/c/WKBase.h

@@ -30 +30 @@
 #include <stdint.h>
 
-#if defined(WIN32) || defined(_WIN32)
+#if (defined(WIN32) || defined(_WIN32)) && !defined(BUILDING_QT__)
 #include <WebKit2/WKBaseWin.h>
 #endif

trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

@@ -424 +424 @@
 } // namespace WebKit
 
-#if defined(WIN32) || defined(_WIN32)
+#if (defined(WIN32) || defined(_WIN32)) && !defined(BUILDING_QT__)
 #include "WKAPICastWin.h"
 #endif