Changeset 237361 in webkit

Timestamp:

Oct 23, 2018 11:30:40 AM (6 years ago)

Author:

ap@apple.com

Message:

Really prevent PLATFORM(IOS) from being used
​https://bugs.webkit.org/show_bug.cgi?id=190813

Reviewed by Tim Horton.

• wtf/Platform.h: This relies on -Wundef, which we have enabled.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-10-22  Alexey Proskuryakov  <ap@apple.com>
+
+        Really prevent PLATFORM(IOS) from being used
+        https://bugs.webkit.org/show_bug.cgi?id=190813
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h: This relies on -Wundef, which we have enabled.
+
 2018-10-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -375 +375 @@
 #if TARGET_OS_IPHONE
 /* FIXME (November 2018): Add WTF_OS_IOS once most patches that used it as an old
- * version of PLATFORM(IOS_FAMILY) are no longer relevant. */
+ * version of OS(IOS_FAMILY) are no longer relevant.  It is currently defined so that
+ * attempting to use it will break the build. */
+#define WTF_OS_IOS UNDEFINED /* Please use OS(IOS_FAMILY) until a more specific macro can be added. */
 #define WTF_OS_IOS_FAMILY 1
 #elif TARGET_OS_MAC
@@ -526 +528 @@
 #elif OS(IOS_FAMILY)
 /* FIXME (November 2018): Add WTF_PLATFORM_IOS once most patches that used it as an old
- * version of PLATFORM(IOS_FAMILY) are no longer relevant. */
+ * version of PLATFORM(IOS_FAMILY) are no longer relevant. It is currently defined so that
+ * attempting to use it will break the build. */
+#define WTF_PLATFORM_IOS UNDEFINED /* Please use PLATFORM(IOS_FAMILY) until a more specific macro can be added. */
 #define WTF_PLATFORM_IOS_FAMILY 1
 #if TARGET_OS_SIMULATOR
 /* FIXME (November 2018): Add WTF_PLATFORM_IOS_SIMULATOR once most patches that used it as an old
- * version of PLATFORM(IOS_FAMILY) are no longer relevant. */
+ * version of PLATFORM(IOS_FAMILY_SIMULATOR) are no longer relevant. It is currently defined so that
+ * attempting to use it will break the build. */
+#define WTF_PLATFORM_IOS_SIMULATOR UNDEFINED /* Please use PLATFORM(IOS_FAMILY_SIMULATOR) until a more specific macro can be added. */
 #define WTF_PLATFORM_IOS_FAMILY_SIMULATOR 1
 #endif