Clean up: Move XPC forward declarations in JavaScriptCore to WTF SPI wrapper header
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Oct 2014 22:38:18 +0000 (22:38 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Oct 2014 22:38:18 +0000 (22:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=137277

Reviewed by Alexey Proskuryakov.

Source/JavaScriptCore:

Use wtf/spi/darwin/XPCSPI.h instead of including the corresponding XPC headers/
forward declaring XPC functions.

* inspector/remote/RemoteInspector.mm:
* inspector/remote/RemoteInspectorXPCConnection.h:
* inspector/remote/RemoteInspectorXPCConnection.mm:

Source/WebKit2:

Use wtf/spi/darwin/XPCSPI.h instead of including the corresponding XPC headers/
forward declaring XPC functions.

* Platform/IPC/Connection.h:
* Platform/IPC/mac/ConnectionMac.mm:
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
* Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:

Source/WTF:

Towards centralizing the declarations of XPC functions used in JavaScriptCore
and WebKit2, add a header that wraps these function declarations called XPCSPI.h
and use it instead of including the corresponding XPC API/SPI headers/forward
declaring XPC functions. This will also aid in the effort to make WebKit2 build
for iOS with the public iOS SDK.

* WTF.xcodeproj/project.pbxproj:
* wtf/spi/darwin/XPCSPI.h: Added.

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

13 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/inspector/remote/RemoteInspector.mm
Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h
Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm
Source/WTF/ChangeLog
Source/WTF/WTF.xcodeproj/project.pbxproj
Source/WTF/wtf/spi/darwin/XPCSPI.h [new file with mode: 0644]
Source/WebKit2/ChangeLog
Source/WebKit2/Platform/IPC/Connection.h
Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm
Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm
Source/WebKit2/Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm

index 7c4791b..e4278ce 100644 (file)
@@ -1,3 +1,17 @@
+2014-10-01  Daniel Bates  <dabates@apple.com>
+
+        Clean up: Move XPC forward declarations in JavaScriptCore to WTF SPI wrapper header
+        https://bugs.webkit.org/show_bug.cgi?id=137277
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use wtf/spi/darwin/XPCSPI.h instead of including the corresponding XPC headers/
+        forward declaring XPC functions.
+
+        * inspector/remote/RemoteInspector.mm:
+        * inspector/remote/RemoteInspectorXPCConnection.h:
+        * inspector/remote/RemoteInspectorXPCConnection.mm:
+
 2014-10-01  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Unreviewed build gardening.
index 81d6840..5073ca5 100644 (file)
 #import <notify.h>
 #import <wtf/Assertions.h>
 #import <wtf/NeverDestroyed.h>
+#import <wtf/spi/darwin/XPCSPI.h>
 #import <wtf/text/WTFString.h>
 
-#if __has_include(<xpc/xpc.h>)
-#import <xpc/xpc.h>
-#endif
-extern "C" {
-    xpc_connection_t xpc_connection_create_mach_service(const char* name, dispatch_queue_t, uint64_t flags);
-    void xpc_release(xpc_object_t);
-}
-
 #if __has_include(<sandbox/private.h>)
 #import <sandbox/private.h>
 #else
index 20e4869..023db2b 100644 (file)
 #import <dispatch/dispatch.h>
 #import <mutex>
 #import <wtf/ThreadSafeRefCounted.h>
-
-#if __has_include(<xpc/xpc.h>)
-#import <xpc/xpc.h>
-#else
-typedef void* xpc_connection_t;
-typedef void* xpc_object_t;
-#endif
+#import <wtf/spi/darwin/XPCSPI.h>
 
 OBJC_CLASS NSDictionary;
 OBJC_CLASS NSString;
index 144d0e6..7614815 100644 (file)
 #import <Foundation/Foundation.h>
 #import <wtf/Assertions.h>
 #import <wtf/Ref.h>
-
-#if !__has_include(<xpc/xpc.h>)
-extern "C" {
-    typedef void (^xpc_handler_t)(xpc_object_t);
-    void xpc_connection_cancel(xpc_connection_t);
-    void xpc_connection_resume(xpc_connection_t);
-    void xpc_connection_send_message(xpc_connection_t, xpc_object_t message);
-    void xpc_connection_set_event_handler(xpc_connection_t, xpc_handler_t);
-    void xpc_connection_set_target_queue(xpc_connection_t, dispatch_queue_t);
-
-    xpc_object_t xpc_retain(xpc_object_t);
-    void xpc_release(xpc_object_t);
-
-    typedef void* xpc_type_t;
-    xpc_type_t xpc_get_type(xpc_object_t);
-
-    void* XPC_ERROR_CONNECTION_INVALID;
-    void* XPC_TYPE_DICTIONARY;
-    void* XPC_TYPE_ERROR;
-
-    xpc_object_t xpc_dictionary_create(const char* const* keys, const xpc_object_t* values, size_t count);
-    xpc_object_t xpc_dictionary_get_value(xpc_object_t, const char* key);
-    void xpc_dictionary_set_value(xpc_object_t, const char* key, xpc_object_t value);
-}
-#endif
+#import <wtf/spi/darwin/XPCSPI.h>
 
 #if __has_include(<CoreFoundation/CFXPCBridge.h>)
 #import <CoreFoundation/CFXPCBridge.h>
index 3e38533..9861081 100644 (file)
@@ -1,3 +1,19 @@
+2014-10-01  Daniel Bates  <dabates@apple.com>
+
+        Clean up: Move XPC forward declarations in JavaScriptCore to WTF SPI wrapper header
+        https://bugs.webkit.org/show_bug.cgi?id=137277
+
+        Reviewed by Alexey Proskuryakov.
+
+        Towards centralizing the declarations of XPC functions used in JavaScriptCore
+        and WebKit2, add a header that wraps these function declarations called XPCSPI.h
+        and use it instead of including the corresponding XPC API/SPI headers/forward
+        declaring XPC functions. This will also aid in the effort to make WebKit2 build
+        for iOS with the public iOS SDK.
+
+        * WTF.xcodeproj/project.pbxproj:
+        * wtf/spi/darwin/XPCSPI.h: Added.
+
 2014-10-01  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] 32-bit JavaScriptCore should limit itself to the C loop
index e4fc724..d6cbd71 100644 (file)
                CD5497AC15857D0300B5BC30 /* MediaTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5497AA15857D0300B5BC30 /* MediaTime.cpp */; };
                CD5497AD15857D0300B5BC30 /* MediaTime.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5497AB15857D0300B5BC30 /* MediaTime.h */; };
                CE46516E19DB1FB4003ECA05 /* NSMapTableSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */; };
+               CE73E02519DCB7AB00580D5C /* XPCSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE73E02419DCB7AB00580D5C /* XPCSPI.h */; };
                E15556F518A0CC18006F48FB /* CryptographicUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */; };
                E15556F618A0CC18006F48FB /* CryptographicUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = E15556F418A0CC18006F48FB /* CryptographicUtilities.h */; };
                EB95E1F0161A72410089A2F5 /* ByteOrder.h in Headers */ = {isa = PBXBuildFile; fileRef = EB95E1EF161A72410089A2F5 /* ByteOrder.h */; };
                CD5497AA15857D0300B5BC30 /* MediaTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTime.cpp; sourceTree = "<group>"; };
                CD5497AB15857D0300B5BC30 /* MediaTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTime.h; sourceTree = "<group>"; };
                CE46516D19DB1FB4003ECA05 /* NSMapTableSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSMapTableSPI.h; sourceTree = "<group>"; };
+               CE73E02419DCB7AB00580D5C /* XPCSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCSPI.h; sourceTree = "<group>"; };
                E15556F318A0CC18006F48FB /* CryptographicUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptographicUtilities.cpp; sourceTree = "<group>"; };
                E15556F418A0CC18006F48FB /* CryptographicUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptographicUtilities.h; sourceTree = "<group>"; };
                EB95E1EF161A72410089A2F5 /* ByteOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteOrder.h; sourceTree = "<group>"; };
                        path = cocoa;
                        sourceTree = "<group>";
                };
+               CE73E02319DCB7AB00580D5C /* darwin */ = {
+                       isa = PBXGroup;
+                       children = (
+                               CE73E02419DCB7AB00580D5C /* XPCSPI.h */,
+                       );
+                       path = darwin;
+                       sourceTree = "<group>";
+               };
                CEF4820C19DA347600CC04B8 /* spi */ = {
                        isa = PBXGroup;
                        children = (
                                CE46516C19DB1FB4003ECA05 /* cocoa */,
+                               CE73E02319DCB7AB00580D5C /* darwin */,
                        );
                        path = spi;
                        sourceTree = "<group>";
                                1FA47C8B152502DA00568D1B /* WebCoreThread.h in Headers */,
                                A8A47446151A825B004123FF /* WTFString.h in Headers */,
                                A8A47487151A825B004123FF /* WTFThreadData.h in Headers */,
+                               CE73E02519DCB7AB00580D5C /* XPCSPI.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
diff --git a/Source/WTF/wtf/spi/darwin/XPCSPI.h b/Source/WTF/wtf/spi/darwin/XPCSPI.h
new file mode 100644 (file)
index 0000000..2c95487
--- /dev/null
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2014 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. 
+ */
+
+#ifndef XPCSPI_h
+#define XPCSPI_h
+
+#include <dispatch/dispatch.h>
+#include <os/object.h>
+
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+#include <xpc/xpc.h>
+#else
+
+#if OS_OBJECT_USE_OBJC
+OS_OBJECT_DECL(xpc_object);
+typedef xpc_object_t xpc_connection_t;
+
+static ALWAYS_INLINE void _xpc_object_validate(xpc_object_t object)
+{
+    void *isa = *(void * volatile *)(OS_OBJECT_BRIDGE void *)object;
+    (void)isa;
+}
+
+#define XPC_GLOBAL_OBJECT(object) ((OS_OBJECT_BRIDGE xpc_object_t)&(object))
+
+#else // OS_OBJECT_USE_OBJC
+
+typedef void* xpc_object_t;
+typedef void* xpc_connection_t;
+
+#define XPC_GLOBAL_OBJECT(object) (&(object))
+
+#endif // OS_OBJECT_USE_OBJC
+
+typedef const struct _xpc_type_s* xpc_type_t;
+
+#if COMPILER_SUPPORTS(BLOCKS)
+typedef bool (^xpc_array_applier_t)(size_t index, xpc_object_t);
+typedef void (^xpc_handler_t)(xpc_object_t);
+#endif
+
+typedef void (*xpc_connection_handler_t)(xpc_connection_t connection);
+
+#define XPC_ARRAY_APPEND ((size_t)(-1))
+#define XPC_ERROR_CONNECTION_INVALID XPC_GLOBAL_OBJECT(_xpc_error_connection_invalid)
+#define XPC_ERROR_TERMINATION_IMMINENT XPC_GLOBAL_OBJECT(_xpc_error_termination_imminent)
+#define XPC_TYPE_ARRAY (&_xpc_type_array)
+#define XPC_TYPE_BOOL (&_xpc_type_bool)
+#define XPC_TYPE_DICTIONARY (&_xpc_type_dictionary)
+#define XPC_TYPE_ERROR (&_xpc_type_error)
+#define XPC_TYPE_STRING (&_xpc_type_string)
+
+#endif // PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <xpc/private.h>
+#endif
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#define CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090 const
+#else
+#define CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090
+#endif
+
+EXTERN_C CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090 struct _xpc_dictionary_s _xpc_error_connection_invalid;
+EXTERN_C CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090 struct _xpc_dictionary_s _xpc_error_termination_imminent;
+
+#undef CONST_ON_OR_AFTER_MAC_OS_X_VERSION_1090
+
+EXTERN_C const struct _xpc_type_s _xpc_type_array;
+EXTERN_C const struct _xpc_type_s _xpc_type_bool;
+EXTERN_C const struct _xpc_type_s _xpc_type_dictionary;
+EXTERN_C const struct _xpc_type_s _xpc_type_error;
+EXTERN_C const struct _xpc_type_s _xpc_type_string;
+
+EXTERN_C xpc_object_t xpc_array_create(const xpc_object_t*, size_t count);
+#if COMPILER_SUPPORTS(BLOCKS)
+EXTERN_C bool xpc_array_apply(xpc_object_t, xpc_array_applier_t);
+#endif
+EXTERN_C size_t xpc_array_get_count(xpc_object_t);
+EXTERN_C const char* xpc_array_get_string(xpc_object_t, size_t index);
+EXTERN_C void xpc_array_set_string(xpc_object_t, size_t index, const char* string);
+EXTERN_C bool xpc_bool_get_value(xpc_object_t);
+EXTERN_C void xpc_connection_cancel(xpc_connection_t);
+EXTERN_C xpc_connection_t xpc_connection_create(const char* name, dispatch_queue_t);
+EXTERN_C xpc_connection_t xpc_connection_create_mach_service(const char* name, dispatch_queue_t, uint64_t flags);
+EXTERN_C pid_t xpc_connection_get_pid(xpc_connection_t);
+EXTERN_C void xpc_connection_resume(xpc_connection_t);
+EXTERN_C void xpc_connection_send_message(xpc_connection_t, xpc_object_t);
+EXTERN_C void xpc_connection_send_message_with_reply(xpc_connection_t, xpc_object_t, dispatch_queue_t, xpc_handler_t);
+EXTERN_C void xpc_connection_set_event_handler(xpc_connection_t, xpc_handler_t);
+EXTERN_C void xpc_connection_set_target_queue(xpc_connection_t, dispatch_queue_t);
+EXTERN_C xpc_object_t xpc_dictionary_create(const char*  const* keys, const xpc_object_t*, size_t count);
+EXTERN_C xpc_object_t xpc_dictionary_create_reply(xpc_object_t);
+EXTERN_C int xpc_dictionary_dup_fd(xpc_object_t, const char* key);
+EXTERN_C xpc_connection_t xpc_dictionary_get_remote_connection(xpc_object_t);
+EXTERN_C bool xpc_dictionary_get_bool(xpc_object_t, const char* key);
+EXTERN_C const char* xpc_dictionary_get_string(xpc_object_t, const char* key);
+EXTERN_C uint64_t xpc_dictionary_get_uint64(xpc_object_t, const char* key);
+EXTERN_C xpc_object_t xpc_dictionary_get_value(xpc_object_t, const char* key);
+EXTERN_C void xpc_dictionary_set_bool(xpc_object_t, const char* key, bool value);
+EXTERN_C void xpc_dictionary_set_fd(xpc_object_t, const char* key, int fd);
+EXTERN_C void xpc_dictionary_set_string(xpc_object_t, const char* key, const char* string);
+EXTERN_C void xpc_dictionary_set_uint64(xpc_object_t, const char* key, uint64_t value);
+EXTERN_C void xpc_dictionary_set_value(xpc_object_t, const char*key, xpc_object_t value);
+EXTERN_C xpc_type_t xpc_get_type(xpc_object_t);
+EXTERN_C void xpc_main(xpc_connection_handler_t);
+EXTERN_C xpc_object_t xpc_retain(xpc_object_t);
+EXTERN_C void xpc_release(xpc_object_t);
+EXTERN_C const char* xpc_string_get_string_ptr(xpc_object_t);
+EXTERN_C void xpc_transaction_begin(void);
+
+EXTERN_C xpc_object_t xpc_connection_copy_entitlement_value(xpc_connection_t, const char* entitlement);
+EXTERN_C void xpc_connection_get_audit_token(xpc_connection_t, audit_token_t*);
+EXTERN_C void xpc_connection_kill(xpc_connection_t, int);
+EXTERN_C void xpc_connection_set_instance(xpc_connection_t, uuid_t);
+EXTERN_C mach_port_t xpc_dictionary_copy_mach_send(xpc_object_t, const char*);
+EXTERN_C void xpc_dictionary_set_mach_send(xpc_object_t, const char*, mach_port_t);
+
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+EXTERN_C void xpc_connection_set_bootstrap(xpc_connection_t, xpc_object_t bootstrap);
+#endif
+
+#if !defined(xpc_retain) && OS_OBJECT_USE_OBJC_RETAIN_RELEASE
+#define xpc_retain(object) ({ xpc_object_t _o = (object); _xpc_object_validate(_o); [_o retain]; })
+#endif
+
+#if !defined(xpc_release) && OS_OBJECT_USE_OBJC_RETAIN_RELEASE
+#define xpc_release(object) ({ xpc_object_t _o = (object); _xpc_object_validate(_o); [_o release]; })
+#endif
+
+#endif // XPCSPI_h
index fae9ed5..2aba1cb 100644 (file)
@@ -1,3 +1,19 @@
+2014-10-01  Daniel Bates  <dabates@apple.com>
+
+        Clean up: Move XPC forward declarations in JavaScriptCore to WTF SPI wrapper header
+        https://bugs.webkit.org/show_bug.cgi?id=137277
+
+        Reviewed by Alexey Proskuryakov.
+
+        Use wtf/spi/darwin/XPCSPI.h instead of including the corresponding XPC headers/
+        forward declaring XPC functions.
+
+        * Platform/IPC/Connection.h:
+        * Platform/IPC/mac/ConnectionMac.mm:
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.Development.mm:
+        * Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm:
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+
 2014-10-01  Christophe Dumez  <cdumez@apple.com>
 
         Use is<>() / downcast<>() for Event classes
index 5a0ad96..b52cf1e 100644 (file)
@@ -42,8 +42,8 @@
 
 #if OS(DARWIN)
 #include <mach/mach_port.h>
-#include <xpc/xpc.h>
 #include <wtf/OSObjectPtr.h>
+#include <wtf/spi/darwin/XPCSPI.h>
 #endif
 
 #if PLATFORM(GTK) || PLATFORM(EFL)
index d91b6d4..c0845ec 100644 (file)
 #include <mach/mach_error.h>
 #include <mach/vm_map.h>
 #include <wtf/RunLoop.h>
-#include <xpc/xpc.h>
+#include <wtf/spi/darwin/XPCSPI.h>
 
 #if PLATFORM(IOS)
 #include "ProcessAssertion.h"
 #endif
 
-#if __has_include(<xpc/private.h>)
-#include <xpc/private.h>
-#else
-extern "C" void xpc_connection_get_audit_token(xpc_connection_t, audit_token_t*);
-extern "C" void xpc_connection_kill(xpc_connection_t, int);
-#endif
-
 #if __has_include(<HIServices/AccessibilityPriv.h>)
 #include <HIServices/AccessibilityPriv.h>
 #else
index b66f231..2e6a980 100644 (file)
@@ -27,7 +27,7 @@
 
 #import <CoreFoundation/CoreFoundation.h>
 #import <wtf/OSObjectPtr.h>
-#import <xpc/xpc.h>
+#import <wtf/spi/darwin/XPCSPI.h>
 
 namespace WebKit {
 
index 5fe8e7f..122017e 100644 (file)
 #import <wtf/RetainPtr.h>
 #import <wtf/RunLoop.h>
 #import <wtf/Threading.h>
+#import <wtf/spi/darwin/XPCSPI.h>
 #import <wtf/text/CString.h>
 #import <wtf/text/WTFString.h>
-#import <xpc/xpc.h>
-
-#if __has_include(<xpc/private.h>)
-#import <xpc/private.h>
-#endif
 
 // FIXME: We should be doing this another way.
 extern "C" kern_return_t bootstrap_register2(mach_port_t, name_t, mach_port_t, uint64_t);
 
-extern "C" void xpc_connection_set_instance(xpc_connection_t, uuid_t);
-extern "C" void xpc_dictionary_set_mach_send(xpc_object_t, const char*, mach_port_t);
-
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-extern "C" void xpc_connection_set_bootstrap(xpc_connection_t connection, xpc_object_t bootstrap);
-
 // FIXME: Soft linking is temporary, make this into a regular function call once this function is available everywhere we need.
 SOFT_LINK_FRAMEWORK(CoreFoundation)
 SOFT_LINK_OPTIONAL(CoreFoundation, _CFBundleSetupXPCBootstrap, void, unused, (xpc_object_t))
-
 #endif
 
 namespace WebKit {