<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195985] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195985">195985</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-02-01 15:55:07 -0800 (Mon, 01 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacImportanceAssertionh">trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h</a></li>
<li><a href="#trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointh">trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h</a></li>
<li><a href="#trunkSourceWebKit2SharedcfArgumentCodersCFcpp">trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacChildProcessMacmm">trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimcpp">trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195984 => 195985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-02-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [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>
+
</ins><span class="cx"> [Xcode] Let Xcode know that the WebKit XPC service products are XPC services
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=153773
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (195984 => 195985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #include "ProcessAssertion.h"
</span><span class="cx"> #include <UIKit/UIAccessibility.h>
</span><span class="cx">
</span><del>-#if __has_include(<AXRuntime/AXNotificationConstants.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <AXRuntime/AXDefines.h>
</span><span class="cx"> #include <AXRuntime/AXNotificationConstants.h>
</span><span class="cx"> #else
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if __has_include(<HIServices/AccessibilityPriv.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <HIServices/AccessibilityPriv.h>
</span><span class="cx"> #else
</span><span class="cx"> typedef enum {
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacImportanceAssertionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ImportanceAssertion.h (195984 => 195985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><del>-#if __has_include(<libproc_internal.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <libproc_internal.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedEntryPointUtilitiesmacXPCServiceXPCServiceEntryPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.h (195984 => 195985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #import <wtf/spi/darwin/XPCSPI.h>
</span><span class="cx">
</span><span class="cx"> #if HAVE(VOUCHERS)
</span><del>-#if __has_include(<os/voucher_private.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <os/voucher_private.h>
</span><span class="cx"> #else
</span><span class="cx"> extern "C" OS_NOTHROW void voucher_replace_default_voucher(void);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedcfArgumentCodersCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/cf/ArgumentCodersCF.cpp (195984 => 195985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,14 +36,14 @@
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(__has_include) && __has_include(<Security/SecIdentityPriv.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <Security/SecIdentityPriv.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> extern "C" SecIdentityRef SecIdentityCreate(CFAllocatorRef allocator, SecCertificateRef certificate, SecKeyRef privateKey);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#if defined(__has_include) && __has_include(<Security/SecKeyPriv.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <Security/SecKeyPriv.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if HAVE(SEC_ACCESS_CONTROL)
</span><del>-#if defined(__has_include) && __has_include(<Security/SecAccessControlPriv.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <Security/SecAccessControlPriv.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacChildProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm (195984 => 195985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,11 +41,9 @@
</span><span class="cx"> #import <wtf/cf/TypeCastsCF.h>
</span><span class="cx"> #import <wtf/spi/darwin/SandboxSPI.h>
</span><span class="cx">
</span><del>-#ifdef __has_include
-#if __has_include(<HIServices/ProcessesPriv.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <HIServices/ProcessesPriv.h>
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
</span><span class="cx"> extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (195984 => 195985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><del>-#if __has_include(<CFNetwork/CFURLConnectionPriv.h>)
</del><ins>+#if USE(APPLE_INTERNAL_SDK)
</ins><span class="cx"> #include <CFNetwork/CFURLConnectionPriv.h>
</span><span class="cx"> #else
</span><span class="cx"> struct _CFNFrameworksStubs {
</span></span></pre>
</div>
</div>
</body>
</html>