Changeset 172532 in webkit for trunk/Source/JavaScriptCore/API

Timestamp:

Aug 13, 2014, 12:43:25 PM (11 years ago)

Author:

[email protected]

Message:

[iOS] Make JavaScriptCore and bmalloc build with the public SDK
​https://bugs.webkit.org/show_bug.cgi?id=135848

Reviewed by Geoffrey Garen.

Source/bmalloc:

• bmalloc/BPlatform.h: Added macro BPLATFORM_IOS_SIMULATOR, which evaluates to true

when building for the iOS Simulator.

• bmalloc/PerThread.h: Use pthread_machdep.h code path when building for iOS Simulator

using the public SDK.
(_pthread_setspecific_direct): Added; only defined when building for the iOS Simulator
using the public SDK.
(_pthread_getspecific_direct): Added; only defined when building for the iOS Simulator
using the public SDK.

Source/JavaScriptCore:

• API/JSBase.h: Declare NSMap functions with external linkage when building for iOS without the

header <Foundation/NSMapTablePriv.h>.

• inspector/remote/RemoteInspector.mm: Define XPC functions with external linkage when building

without the system header <xpc/xpc.h>.

• inspector/remote/RemoteInspectorXPCConnection.h: Define xpc_connection_t and xpc_object_t when building

without the system header <xpc/xpc.h>.

• inspector/remote/RemoteInspectorXPCConnection.mm: Declare XPC functions with external linkage when

building without without the system header <xpc/xpc.h>.
(Inspector::RemoteInspectorXPCConnection::closeOnQueue): Fix code style; use nullptr instead of NULL.
(Inspector::RemoteInspectorXPCConnection::sendMessage): Ditto.

File:

• trunk/Source/JavaScriptCore/API/JSBase.h (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSBase.h

@@ -33 +33 @@
 #ifdef __OBJC__
 #import <Foundation/Foundation.h>
+
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#if __has_include(<Foundation/NSMapTablePriv.h>)
+#import <Foundation/NSMapTablePriv.h>
+#else
+extern "C" {
+    void *NSMapGet(NSMapTable *, const void *key);
+    void NSMapInsert(NSMapTable *, const void *key, const void *value);
+    void NSMapRemove(NSMapTable *, const void *key);
+}
 #endif
+#endif // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+#endif // __OBJC__
 
 /* JavaScript engine interface */