Title: [210053] trunk/Source
- Revision
- 210053
- Author
- [email protected]
- Date
- 2016-12-20 20:29:44 -0800 (Tue, 20 Dec 2016)
Log Message
Fix undefined behavior caused by macro expansion producing 'defined'
https://bugs.webkit.org/show_bug.cgi?id=166047
Patch by Taras Tsugrii <[email protected]> on 2016-12-20
Reviewed by Darin Adler.
Source/_javascript_Core:
* API/JSBase.h:
Source/WebKit2:
* Shared/API/Cocoa/WKFoundation.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/API/JSBase.h (210052 => 210053)
--- trunk/Source/_javascript_Core/API/JSBase.h 2016-12-21 04:04:50 UTC (rev 210052)
+++ trunk/Source/_javascript_Core/API/JSBase.h 2016-12-21 04:29:44 UTC (rev 210053)
@@ -138,7 +138,11 @@
/* Enable the Objective-C API for platforms with a modern runtime. */
#if !defined(JSC_OBJC_API_ENABLED)
-#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
+#if (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
+#define JSC_OBJC_API_ENABLED 1
+#else
+#define JSC_OBJC_API_ENABLED 0
#endif
+#endif
#endif /* JSBase_h */
Modified: trunk/Source/_javascript_Core/ChangeLog (210052 => 210053)
--- trunk/Source/_javascript_Core/ChangeLog 2016-12-21 04:04:50 UTC (rev 210052)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-12-21 04:29:44 UTC (rev 210053)
@@ -1,3 +1,12 @@
+2016-12-20 Taras Tsugrii <[email protected]>
+
+ Fix undefined behavior caused by macro expansion producing 'defined'
+ https://bugs.webkit.org/show_bug.cgi?id=166047
+
+ Reviewed by Darin Adler.
+
+ * API/JSBase.h:
+
2016-12-20 Keith Miller <[email protected]>
Add support for global
Modified: trunk/Source/WebKit2/ChangeLog (210052 => 210053)
--- trunk/Source/WebKit2/ChangeLog 2016-12-21 04:04:50 UTC (rev 210052)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-21 04:29:44 UTC (rev 210053)
@@ -1,3 +1,12 @@
+2016-12-20 Taras Tsugrii <[email protected]>
+
+ Fix undefined behavior caused by macro expansion producing 'defined'
+ https://bugs.webkit.org/show_bug.cgi?id=166047
+
+ Reviewed by Darin Adler.
+
+ * Shared/API/Cocoa/WKFoundation.h:
+
2016-12-20 Brent Fulgham <[email protected]>
Address some style problems found by static analysis
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (210052 => 210053)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-12-21 04:04:50 UTC (rev 210052)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-12-21 04:29:44 UTC (rev 210053)
@@ -27,10 +27,10 @@
#import <TargetConditionals.h>
#if !defined(WK_API_ENABLED)
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE || (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
#define WK_API_ENABLED 1
#else
-#define WK_API_ENABLED (defined(__clang__) && defined(__APPLE__) && !defined(__i386__))
+#define WK_API_ENABLED 0
#endif
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
