[Cocoa] Remove some more __has_include guards

https://bugs.webkit.org/show_bug.cgi?id=153774

Reviewed by Tim Horton.

Guard private header includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.

* Platform/IPC/mac/ConnectionMac.mm:
* Platform/IPC/mac/ImportanceAssertion.h:
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h:
* Shared/cf/ArgumentCodersCF.cpp:
* Shared/mac/ChildProcessMac.mm:
* Shared/mac/SecItemShim.cpp:

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

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index c6340b3..c3c97b3 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,21 @@
 2016-02-01  Dan Bernstein  <mitz@apple.com>
 
+        [Cocoa] Remove some more __has_include guards
+        https://bugs.webkit.org/show_bug.cgi?id=153774
+
+        Reviewed by Tim Horton.
+
+        Guard private header includes with #if USE(APPLE_INTERNAL_SDK) rather than with __has_include.
+
+        * Platform/IPC/mac/ConnectionMac.mm:
+        * Platform/IPC/mac/ImportanceAssertion.h:
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h:
+        * Shared/cf/ArgumentCodersCF.cpp:
+        * Shared/mac/ChildProcessMac.mm:
+        * Shared/mac/SecItemShim.cpp:
+
+2016-02-01  Dan Bernstein  <mitz@apple.com>
+
         [Xcode] Let Xcode know that the WebKit XPC service products are XPC services
         https://bugs.webkit.org/show_bug.cgi?id=153773
 

diff --git a/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm b/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
index 530bd86..e3731f9 100644 (file)
--- a/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
+++ b/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
@@ -41,7 +41,7 @@
 #include "ProcessAssertion.h"
 #include <UIKit/UIAccessibility.h>
 
-#if __has_include(<AXRuntime/AXNotificationConstants.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <AXRuntime/AXDefines.h>
 #include <AXRuntime/AXNotificationConstants.h>
 #else
@@ -50,7 +50,7 @@
 
 #endif
 
-#if __has_include(<HIServices/AccessibilityPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <HIServices/AccessibilityPriv.h>
 #else
 typedef enum {

diff --git a/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h b/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h
index 967af89..f7687a7 100644 (file)
--- a/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h
+++ b/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h
@@ -28,7 +28,7 @@
 
 #if PLATFORM(MAC)
 
-#if __has_include(<libproc_internal.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <libproc_internal.h>
 #endif
 

diff --git a/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h b/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h
index ebbea56..c6a3190 100644 (file)
--- a/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h
+++ b/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h
@@ -32,7 +32,7 @@
 #import <wtf/spi/darwin/XPCSPI.h>
 
 #if HAVE(VOUCHERS)
-#if __has_include(<os/voucher_private.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <os/voucher_private.h>
 #else
 extern "C" OS_NOTHROW void voucher_replace_default_voucher(void);

diff --git a/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp b/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
index ebf0926..48e85a0 100644 (file)
--- a/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
+++ b/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp
@@ -36,14 +36,14 @@
 #import <Foundation/Foundation.h>
 #endif
 
-#if defined(__has_include) && __has_include(<Security/SecIdentityPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <Security/SecIdentityPriv.h>
 #endif
 
 extern "C" SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificateRef certificate, SecKeyRef privateKey);
 
 #if PLATFORM(IOS)
-#if defined(__has_include) && __has_include(<Security/SecKeyPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <Security/SecKeyPriv.h>
 #endif
 
@@ -51,7 +51,7 @@ extern "C" OSStatus SecKeyFindWithPersistentRef(CFDataRef persistentRef, SecKeyR
 #endif
 
 #if HAVE(SEC_ACCESS_CONTROL)
-#if defined(__has_include) && __has_include(<Security/SecAccessControlPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <Security/SecAccessControlPriv.h>
 #endif
 

diff --git a/Source/WebKit2/Shared/mac/ChildProcessMac.mm b/Source/WebKit2/Shared/mac/ChildProcessMac.mm
index a5beeac..2851361 100644 (file)
--- a/Source/WebKit2/Shared/mac/ChildProcessMac.mm
+++ b/Source/WebKit2/Shared/mac/ChildProcessMac.mm
@@ -41,11 +41,9 @@
 #import <wtf/cf/TypeCastsCF.h>
 #import <wtf/spi/darwin/SandboxSPI.h>
 
-#ifdef __has_include
-#if __has_include(<HIServices/ProcessesPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <HIServices/ProcessesPriv.h>
 #endif
-#endif
 
 typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
 extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);

diff --git a/Source/WebKit2/Shared/mac/SecItemShim.cpp b/Source/WebKit2/Shared/mac/SecItemShim.cpp
index 2a73205..1ec08fe 100644 (file)
--- a/Source/WebKit2/Shared/mac/SecItemShim.cpp
+++ b/Source/WebKit2/Shared/mac/SecItemShim.cpp
@@ -41,7 +41,7 @@
 #include <mutex>
 #include <wtf/NeverDestroyed.h>
 
-#if __has_include(<CFNetwork/CFURLConnectionPriv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <CFNetwork/CFURLConnectionPriv.h>
 #else
 struct _CFNFrameworksStubs {