[PAL] Add symbol export macros for PAL
authordon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Jun 2017 21:30:01 +0000 (21:30 +0000)
committerdon.olmstead@sony.com <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Jun 2017 21:30:01 +0000 (21:30 +0000)
https://bugs.webkit.org/show_bug.cgi?id=171519

Reviewed by Konstantin Tokarev.

Source/WebCore:

No new tests. No change in behavior.

* CMakeLists.txt:
* config.h:
* platform/PlatformExportMacros.h:

Source/WebCore/PAL:

No new tests. No change in behavior.

* Configurations/CopyPALHeaders.xcconfig: Added.
* PAL.xcodeproj/project.pbxproj:
* config.h:
* pal/ExportMacros.h: Copied from Source/WebCore/platform/PlatformExportMacros.h.
* pal/PlatformWin.cmake:
* pal/crypto/CryptoDigest.h:

Source/WebKit2:

* config.h:

Tools:

* DumpRenderTree/config.h:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/config.h:
* WebKitTestRunner/config.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@218843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

18 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/CopyPALHeaders.xcconfig [new file with mode: 0644]
Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
Source/WebCore/PAL/config.h
Source/WebCore/PAL/pal/ExportMacros.h [new file with mode: 0644]
Source/WebCore/PAL/pal/PlatformWin.cmake
Source/WebCore/PAL/pal/crypto/CryptoDigest.h
Source/WebCore/config.h
Source/WebCore/platform/PlatformExportMacros.h
Source/WebKit2/ChangeLog
Source/WebKit2/config.h
Tools/ChangeLog
Tools/DumpRenderTree/config.h
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/config.h
Tools/WebKitTestRunner/config.h

index 8b9acda..6752709 100644 (file)
@@ -3,6 +3,10 @@ include(WebKitCommon)
 set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
 add_subdirectory(PAL/pal)
 
+if (PAL_LIBRARY_TYPE MATCHES STATIC)
+    add_definitions(-DSTATICALLY_LINKED_WITH_PAL=1)
+endif ()
+
 set(WebCore_INCLUDE_DIRECTORIES
     "${CMAKE_BINARY_DIR}"
     "${WEBCORE_DIR}"
@@ -115,6 +119,7 @@ set(WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/xml"
     "${WEBCORE_DIR}/xml/parser"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
+    "${PAL_DIR}"
     "${CMAKE_SOURCE_DIR}/Source"
 )
 
index a02428f..529911b 100644 (file)
@@ -1,3 +1,16 @@
+2017-06-27  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Add symbol export macros for PAL
+        https://bugs.webkit.org/show_bug.cgi?id=171519
+
+        Reviewed by Konstantin Tokarev.
+
+        No new tests. No change in behavior.
+
+        * CMakeLists.txt:
+        * config.h:
+        * platform/PlatformExportMacros.h:
+
 2017-06-27  John Wilander  <wilander@apple.com>
 
         Resource Load Statistics: Add telemetry
index 8ddbe0e..b09af02 100644 (file)
@@ -1,3 +1,19 @@
+2017-06-27  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Add symbol export macros for PAL
+        https://bugs.webkit.org/show_bug.cgi?id=171519
+
+        Reviewed by Konstantin Tokarev.
+
+        No new tests. No change in behavior.
+
+        * Configurations/CopyPALHeaders.xcconfig: Added.
+        * PAL.xcodeproj/project.pbxproj:
+        * config.h:
+        * pal/ExportMacros.h: Copied from Source/WebCore/platform/PlatformExportMacros.h.
+        * pal/PlatformWin.cmake:
+        * pal/crypto/CryptoDigest.h:
+
 2017-06-20  Zan Dobersek  <zdobersek@igalia.com>
 
         [GCrypt] Implement CryptoKeyEC SPKI imports
diff --git a/Source/WebCore/PAL/Configurations/CopyPALHeaders.xcconfig b/Source/WebCore/PAL/Configurations/CopyPALHeaders.xcconfig
new file mode 100644 (file)
index 0000000..9924a50
--- /dev/null
@@ -0,0 +1,25 @@
+// Copyright (C) 2017 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in the
+//    documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+PRIVATE_HEADERS_FOLDER_PATH = usr/local/include/pal;
+INSTALLHDRS_SCRIPT_PHASE = YES;
index ecdd6db..2f00f4f 100644 (file)
@@ -6,13 +6,39 @@
        objectVersion = 46;
        objects = {
 
+/* Begin PBXAggregateTarget section */
+               C280B4201EFD056400D35135 /* Copy PAL Headers */ = {
+                       isa = PBXAggregateTarget;
+                       buildConfigurationList = C280B4251EFD056400D35135 /* Build configuration list for PBXAggregateTarget "Copy PAL Headers" */;
+                       buildPhases = (
+                               C280B42A1EFD05CE00D35135 /* Copy PAL Headers */,
+                       );
+                       dependencies = (
+                       );
+                       name = "Copy PAL Headers";
+                       productName = "Copy PAL Headers";
+               };
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
+               0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */; };
                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0521E31C44100725F18 /* CryptoDigest.h */; };
                1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C09D0551E31C46500725F18 /* CryptoDigestCommonCrypto.cpp */; };
                1C09D0581E31C57E00725F18 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0571E31C57E00725F18 /* config.h */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+               C280B42C1EFD07FE00D35135 /* PBXContainerItemProxy */ = {
+                       isa = PBXContainerItemProxy;
+                       containerPortal = 1C09D0351E31C32800725F18 /* Project object */;
+                       proxyType = 1;
+                       remoteGlobalIDString = C280B4201EFD056400D35135;
+                       remoteInfo = "Copy PAL Headers";
+               };
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXFileReference section */
+               0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExportMacros.h; sourceTree = "<group>"; };
                1C09D03D1E31C32800725F18 /* libPAL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPAL.a; sourceTree = BUILT_PRODUCTS_DIR; };
                1C09D0521E31C44100725F18 /* CryptoDigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoDigest.h; sourceTree = "<group>"; };
                1C09D0551E31C46500725F18 /* CryptoDigestCommonCrypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CryptoDigestCommonCrypto.cpp; path = commoncrypto/CryptoDigestCommonCrypto.cpp; sourceTree = "<group>"; };
@@ -22,6 +48,7 @@
                1C09D0631E31EC3100725F18 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
                1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
                1C67CEA21E32EE2600F80F2E /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
+               C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyPALHeaders.xcconfig; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -56,6 +83,7 @@
                1C09D03F1E31C32800725F18 /* pal */ = {
                        isa = PBXGroup;
                        children = (
+                               0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */,
                                1C09D0511E31C41200725F18 /* crypto */,
                        );
                        path = pal;
                                1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */,
                                1C09D05D1E31C77A00725F18 /* PAL.xcconfig */,
                                1C67CEA21E32EE2600F80F2E /* Version.xcconfig */,
+                               C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */,
                        );
                        path = Configurations;
                        sourceTree = "<group>";
                        files = (
                                1C09D0581E31C57E00725F18 /* config.h in Headers */,
                                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */,
+                               0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
                        buildRules = (
                        );
                        dependencies = (
+                               C280B42D1EFD07FE00D35135 /* PBXTargetDependency */,
                        );
                        name = PAL;
                        productName = PAL;
                                                CreatedOnToolsVersion = 8.3;
                                                ProvisioningStyle = Automatic;
                                        };
+                                       C280B4201EFD056400D35135 = {
+                                               CreatedOnToolsVersion = 8.3.3;
+                                               ProvisioningStyle = Automatic;
+                                       };
                                };
                        };
                        buildConfigurationList = 1C09D0381E31C32800725F18 /* Build configuration list for PBXProject "PAL" */;
                        projectRoot = "";
                        targets = (
                                1C09D03C1E31C32800725F18 /* PAL */,
+                               C280B4201EFD056400D35135 /* Copy PAL Headers */,
                        );
                };
 /* End PBXProject section */
 
+/* Begin PBXShellScriptBuildPhase section */
+               C280B42A1EFD05CE00D35135 /* Copy PAL Headers */ = {
+                       isa = PBXShellScriptBuildPhase;
+                       buildActionMask = 2147483647;
+                       files = (
+                       );
+                       inputPaths = (
+                       );
+                       name = "Copy PAL Headers";
+                       outputPaths = (
+                       );
+                       runOnlyForDeploymentPostprocessing = 0;
+                       shellPath = /bin/sh;
+                       shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n    PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n    PRIVATE_HEADERS_PATH=\"${DSTROOT}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/pal/\" \"${PRIVATE_HEADERS_PATH}\"\n";
+               };
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
                1C09D0391E31C32800725F18 /* Sources */ = {
                        isa = PBXSourcesBuildPhase;
                };
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+               C280B42D1EFD07FE00D35135 /* PBXTargetDependency */ = {
+                       isa = PBXTargetDependency;
+                       target = C280B4201EFD056400D35135 /* Copy PAL Headers */;
+                       targetProxy = C280B42C1EFD07FE00D35135 /* PBXContainerItemProxy */;
+               };
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
                1C09D0461E31C32800725F18 /* Debug */ = {
                        isa = XCBuildConfiguration;
                        };
                        name = Production;
                };
+               C280B4261EFD056400D35135 /* Debug */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Debug;
+               };
+               C280B4271EFD056400D35135 /* Release */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Release;
+               };
+               C280B4281EFD056400D35135 /* Production */ = {
+                       isa = XCBuildConfiguration;
+                       baseConfigurationReference = C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */;
+                       buildSettings = {
+                               PRODUCT_NAME = "$(TARGET_NAME)";
+                       };
+                       name = Production;
+               };
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
                        defaultConfigurationIsVisible = 0;
                        defaultConfigurationName = Production;
                };
+               C280B4251EFD056400D35135 /* Build configuration list for PBXAggregateTarget "Copy PAL Headers" */ = {
+                       isa = XCConfigurationList;
+                       buildConfigurations = (
+                               C280B4261EFD056400D35135 /* Debug */,
+                               C280B4271EFD056400D35135 /* Release */,
+                               C280B4281EFD056400D35135 /* Production */,
+                       );
+                       defaultConfigurationIsVisible = 0;
+                       defaultConfigurationName = Production;
+               };
 /* End XCConfigurationList section */
        };
        rootObject = 1C09D0351E31C32800725F18 /* Project object */;
index a8c4731..5c3bcc3 100644 (file)
@@ -23,9 +23,7 @@
 #include "cmakeconfig.h"
 #endif
 
-#include <wtf/Platform.h>
-
-#include <wtf/ExportMacros.h>
+#include <pal/ExportMacros.h>
 
 #ifdef __cplusplus
 
diff --git a/Source/WebCore/PAL/pal/ExportMacros.h b/Source/WebCore/PAL/pal/ExportMacros.h
new file mode 100644 (file)
index 0000000..a39c898
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2017 Sony Interactive Entertainment Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This file handles shared library symbol export decorations. It is recommended
+ * that all WebKit projects use these definitions so that symbol exports work
+ * properly on all platforms and compilers that WebKit builds under.
+ */
+
+#pragma once
+
+#include <wtf/ExportMacros.h>
+
+// See note in wtf/Platform.h for more info on EXPORT_MACROS.
+#if USE(EXPORT_MACROS)
+
+#if defined(BUILDING_PAL) || defined(STATICALLY_LINKED_WITH_PAL)
+#define PAL_EXPORT WTF_EXPORT
+#else
+#define PAL_EXPORT WTF_IMPORT
+#endif
+
+#define PAL_TESTSUPPORT_EXPORT PAL_EXPORT
+
+#else // !USE(EXPORT_MACROS)
+
+#define PAL_EXPORT
+#define PAL_TESTSUPPORT_EXPORT
+
+#endif // USE(EXPORT_MACROS)
index 6f6919f..ffa9257 100644 (file)
@@ -1,3 +1,5 @@
 list(APPEND PAL_SOURCES
     crypto/win/CryptoDigestWin.cpp
 )
+
+set(PAL_OUTPUT_NAME PAL${DEBUG_SUFFIX})
index 588e127..06c18c3 100644 (file)
@@ -42,11 +42,11 @@ public:
         SHA_384,
         SHA_512,
     };
-    static std::unique_ptr<CryptoDigest> create(Algorithm);
-    ~CryptoDigest();
+    PAL_EXPORT static std::unique_ptr<CryptoDigest> create(Algorithm);
+    PAL_EXPORT ~CryptoDigest();
 
-    void addBytes(const void* input, size_t length);
-    Vector<uint8_t> computeHash();
+    PAL_EXPORT void addBytes(const void* input, size_t length);
+    PAL_EXPORT Vector<uint8_t> computeHash();
 
 private:
     CryptoDigest();
index cf2579a..3e11a65 100644 (file)
@@ -33,9 +33,8 @@
 #include "WebCoreHeaderDetection.h"
 #endif
 
-#include <wtf/ExportMacros.h>
 #include "PlatformExportMacros.h"
-
+#include <pal/ExportMacros.h>
 #include <runtime/JSExportMacros.h>
 
 #ifdef __APPLE__
index cc63fae..407468d 100644 (file)
  * that all WebKit projects use these definitions so that symbol exports work
  * properly on all platforms and compilers that WebKit builds under.
  */
-#ifndef PlatformExportMacros_h
-#define PlatformExportMacros_h
 
-#include <wtf/Platform.h>
+#pragma once
+
 #include <wtf/ExportMacros.h>
 
 // See note in wtf/Platform.h for more info on EXPORT_MACROS.
@@ -47,5 +46,3 @@
 #define WEBCORE_TESTSUPPORT_EXPORT
 
 #endif // USE(EXPORT_MACROS)
-
-#endif // PlatformExportMacros_h
index 804704c..cb2016e 100644 (file)
@@ -1,3 +1,12 @@
+2017-06-27  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Add symbol export macros for PAL
+        https://bugs.webkit.org/show_bug.cgi?id=171519
+
+        Reviewed by Konstantin Tokarev.
+
+        * config.h:
+
 2017-06-27  Ryosuke Niwa  <rniwa@webkit.org>
 
         ProcessLauncherMac could leak a xpc connection when the process had failed to launch
index 6afd2b5..544ecd7 100644 (file)
 #include "cmakeconfig.h"
 #endif
 
-#include <wtf/Platform.h>
-
 #include <WebCore/PlatformExportMacros.h>
+#include <pal/ExportMacros.h>
 #include <runtime/JSExportMacros.h>
 #include <wtf/DisallowCType.h>
-#include <wtf/ExportMacros.h>
 
 #ifdef __cplusplus
 
index 0992c0d..412a0b9 100644 (file)
@@ -1,3 +1,15 @@
+2017-06-27  Don Olmstead  <don.olmstead@sony.com>
+
+        [PAL] Add symbol export macros for PAL
+        https://bugs.webkit.org/show_bug.cgi?id=171519
+
+        Reviewed by Konstantin Tokarev.
+
+        * DumpRenderTree/config.h:
+        * TestWebKitAPI/CMakeLists.txt:
+        * TestWebKitAPI/config.h:
+        * WebKitTestRunner/config.h:
+
 2017-06-27  John Wilander  <wilander@apple.com>
 
         Resource Load Statistics: Add telemetry
index 9e82548..78d8500 100644 (file)
  *
  */
 
-#pragma once
-
 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
 #include "cmakeconfig.h"
 #endif
 
 #include <WebCore/PlatformExportMacros.h>
+#include <pal/ExportMacros.h>
 #include <runtime/JSExportMacros.h>
 
 #ifdef __cplusplus
index d88df79..799fdd8 100644 (file)
@@ -100,6 +100,7 @@ include_directories(
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/Source
     ${JAVASCRIPTCORE_DIR}
+    ${PAL_DIR}
     ${THIRDPARTY_DIR}/gtest/include
     ${WEBKIT2_DIR}/Platform/IPC
     ${WEBKIT2_DIR}/Shared
index f0a490d..fe43f73 100644 (file)
@@ -30,6 +30,7 @@
 #include <runtime/JSExportMacros.h>
 #ifndef BUILDING_JSCONLY__
 #include <WebCore/PlatformExportMacros.h>
+#include <pal/ExportMacros.h>
 #endif
 
 #if defined(__APPLE__) && __APPLE__
index 4042b71..c017892 100644 (file)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef WebKitTestRunner_config_h
-#define WebKitTestRunner_config_h
 
-#if defined (BUILDING_WITH_CMAKE)
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
 #include "cmakeconfig.h"
 #endif
 
 #include <WebCore/PlatformExportMacros.h>
 #include <WebKit/WebKit2_C.h>
-#include <wtf/Platform.h>
-#include <wtf/ExportMacros.h>
+#include <pal/ExportMacros.h>
 #include <runtime/JSExportMacros.h>
-
-#endif