Title: [195985] trunk/Source/WebKit2
- Revision
- 195985
- Author
- [email protected]
- Date
- 2016-02-01 15:55:07 -0800 (Mon, 01 Feb 2016)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (195984 => 195985)
--- trunk/Source/WebKit2/ChangeLog 2016-02-01 23:40:39 UTC (rev 195984)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-01 23:55:07 UTC (rev 195985)
@@ -1,5 +1,21 @@
2016-02-01 Dan Bernstein <[email protected]>
+ [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 <[email protected]>
+
[Xcode] Let Xcode know that the WebKit XPC service products are XPC services
https://bugs.webkit.org/show_bug.cgi?id=153773
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (195984 => 195985)
--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2016-02-01 23:40:39 UTC (rev 195984)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2016-02-01 23:55:07 UTC (rev 195985)
@@ -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 {
Modified: trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (195984 => 195985)
--- trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2016-02-01 23:40:39 UTC (rev 195984)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h 2016-02-01 23:55:07 UTC (rev 195985)
@@ -28,7 +28,7 @@
#if PLATFORM(MAC)
-#if __has_include(<libproc_internal.h>)
+#if USE(APPLE_INTERNAL_SDK)
#include <libproc_internal.h>
#endif
Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h (195984 => 195985)
--- trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2016-02-01 23:40:39 UTC (rev 195984)
+++ trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h 2016-02-01 23:55:07 UTC (rev 195985)
@@ -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);
Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp (195984 => 195985)
--- trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2016-02-01 23:40:39 UTC (rev 195984)
+++ trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp 2016-02-01 23:55:07 UTC (rev 195985)
@@ -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 @@
#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
Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (195984 => 195985)
--- trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-02-01 23:40:39 UTC (rev 195984)
+++ trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm 2016-02-01 23:55:07 UTC (rev 195985)
@@ -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);
Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (195984 => 195985)
--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2016-02-01 23:40:39 UTC (rev 195984)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp 2016-02-01 23:55:07 UTC (rev 195985)
@@ -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 {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
