Title: [159125] trunk/Source/_javascript_Core
- Revision
- 159125
- Author
- [email protected]
- Date
- 2013-11-12 11:01:10 -0800 (Tue, 12 Nov 2013)
Log Message
[iOS] Define JSC_OBJC_API_ENABLED
https://bugs.webkit.org/show_bug.cgi?id=124192
Reviewed by Geoffrey Garen.
* API/JSBase.h: JSC_OBJC_API_ENABLED should evaluate to true if
TARGET_OS_IPHONE is true.
* API/JSValue.h: Ensure CG types referenced later in the file are defined.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/API/JSBase.h (159124 => 159125)
--- trunk/Source/_javascript_Core/API/JSBase.h 2013-11-12 18:55:22 UTC (rev 159124)
+++ trunk/Source/_javascript_Core/API/JSBase.h 2013-11-12 19:01:10 UTC (rev 159125)
@@ -142,7 +142,7 @@
/* Enable the Objective-C API for platforms with a modern runtime. */
#if !defined(JSC_OBJC_API_ENABLED)
#ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
-#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__))
+#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
#else
#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__))
#endif
Modified: trunk/Source/_javascript_Core/API/JSValue.h (159124 => 159125)
--- trunk/Source/_javascript_Core/API/JSValue.h 2013-11-12 18:55:22 UTC (rev 159124)
+++ trunk/Source/_javascript_Core/API/JSValue.h 2013-11-12 19:01:10 UTC (rev 159125)
@@ -28,6 +28,8 @@
#if JSC_OBJC_API_ENABLED
+#import <CoreGraphics/CGGeometry.h>
+
@class JSContext;
// A JSValue is a reference to a value within the _javascript_ object space of a
Modified: trunk/Source/_javascript_Core/ChangeLog (159124 => 159125)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-12 18:55:22 UTC (rev 159124)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-12 19:01:10 UTC (rev 159125)
@@ -1,3 +1,14 @@
+2013-11-11 Andy Estes <[email protected]>
+
+ [iOS] Define JSC_OBJC_API_ENABLED
+ https://bugs.webkit.org/show_bug.cgi?id=124192
+
+ Reviewed by Geoffrey Garen.
+
+ * API/JSBase.h: JSC_OBJC_API_ENABLED should evaluate to true if
+ TARGET_OS_IPHONE is true.
+ * API/JSValue.h: Ensure CG types referenced later in the file are defined.
+
2013-11-12 Balazs Kilvady <[email protected]>
Fix undefined reference issues in _javascript_Core build.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
