Title: [225558] trunk/Source
- Revision
- 225558
- Author
- [email protected]
- Date
- 2017-12-05 17:30:24 -0800 (Tue, 05 Dec 2017)
Log Message
[Darwin] Simplify use of TargetConditionals
https://bugs.webkit.org/show_bug.cgi?id=180455
<rdar://problem/35142971>
Reviewed by Tim Horton.
There's no need to check if TARGET_* macros are defined on Darwin platforms, since
TargetConditionals.h always defines them. Also, we can simplify
(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) to TARGET_OS_IPHONE.
Source/bmalloc:
* bmalloc/BPlatform.h:
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (225557 => 225558)
--- trunk/Source/WTF/ChangeLog 2017-12-06 00:57:40 UTC (rev 225557)
+++ trunk/Source/WTF/ChangeLog 2017-12-06 01:30:24 UTC (rev 225558)
@@ -1,3 +1,17 @@
+2017-12-05 Andy Estes <[email protected]>
+
+ [Darwin] Simplify use of TargetConditionals
+ https://bugs.webkit.org/show_bug.cgi?id=180455
+ <rdar://problem/35142971>
+
+ Reviewed by Tim Horton.
+
+ There's no need to check if TARGET_* macros are defined on Darwin platforms, since
+ TargetConditionals.h always defines them. Also, we can simplify
+ (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) to TARGET_OS_IPHONE.
+
+ * wtf/Platform.h:
+
2017-12-05 Matt Lewis <[email protected]>
Unreviewed, rolling out r225430.
Modified: trunk/Source/WTF/wtf/Platform.h (225557 => 225558)
--- trunk/Source/WTF/wtf/Platform.h 2017-12-06 00:57:40 UTC (rev 225557)
+++ trunk/Source/WTF/wtf/Platform.h 2017-12-06 01:30:24 UTC (rev 225558)
@@ -345,13 +345,13 @@
/* OS(IOS) - iOS */
/* OS(MAC_OS_X) - Mac OS X (not including iOS) */
-#if OS(DARWIN) && ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
- || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \
- || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR))
+#if OS(DARWIN)
+#if TARGET_OS_IPHONE
#define WTF_OS_IOS 1
-#elif OS(DARWIN) && defined(TARGET_OS_MAC) && TARGET_OS_MAC
+#elif TARGET_OS_MAC
#define WTF_OS_MAC_OS_X 1
#endif
+#endif
/* OS(FREEBSD) - FreeBSD */
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
@@ -489,7 +489,7 @@
#define WTF_PLATFORM_MAC 1
#elif OS(IOS)
#define WTF_PLATFORM_IOS 1
-#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
+#if TARGET_IPHONE_SIMULATOR
#define WTF_PLATFORM_IOS_SIMULATOR 1
#endif
#elif OS(WINDOWS)
Modified: trunk/Source/bmalloc/ChangeLog (225557 => 225558)
--- trunk/Source/bmalloc/ChangeLog 2017-12-06 00:57:40 UTC (rev 225557)
+++ trunk/Source/bmalloc/ChangeLog 2017-12-06 01:30:24 UTC (rev 225558)
@@ -1,3 +1,17 @@
+2017-12-05 Andy Estes <[email protected]>
+
+ [Darwin] Simplify use of TargetConditionals
+ https://bugs.webkit.org/show_bug.cgi?id=180455
+ <rdar://problem/35142971>
+
+ Reviewed by Tim Horton.
+
+ There's no need to check if TARGET_* macros are defined on Darwin platforms, since
+ TargetConditionals.h always defines them. Also, we can simplify
+ (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) to TARGET_OS_IPHONE.
+
+ * bmalloc/BPlatform.h:
+
2017-12-05 Filip Pizlo <[email protected]>
bmalloc IsoHeap needs to allow a thread to deallocate some size for the first time
Modified: trunk/Source/bmalloc/bmalloc/BPlatform.h (225557 => 225558)
--- trunk/Source/bmalloc/bmalloc/BPlatform.h 2017-12-06 00:57:40 UTC (rev 225557)
+++ trunk/Source/bmalloc/bmalloc/BPlatform.h 2017-12-06 01:30:24 UTC (rev 225558)
@@ -52,16 +52,16 @@
#define BOS_WINDOWS 1
#endif
-#if BOS(DARWIN) && ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
- || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \
- || (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR))
+#if BOS(DARWIN)
+#if TARGET_OS_IPHONE
#define BPLATFORM_IOS 1
-#if (defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR)
+#if TARGET_IPHONE_SIMULATOR
#define BPLATFORM_IOS_SIMULATOR 1
#endif
-#elif BOS(DARWIN) && defined(TARGET_OS_MAC) && TARGET_OS_MAC
+#elif TARGET_OS_MAC
#define BPLATFORM_MAC 1
#endif
+#endif
/* ==== Policy decision macros: these define policy choices for a particular port. ==== */
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
