Changeset 286645 in webkit

Timestamp:

Dec 7, 2021, 11:27:20 PM (5 years ago)

Author:

mmaxfield@apple.com

Message:

[MacCatalyst] Fix build after r286603
​https://bugs.webkit.org/show_bug.cgi?id=233977

Unreviewed.

Previously, TARGET_OS_IOS and TARGET_OS_MACCATALYST were never on at the same time.
Now, they're on at the same time, and ANGLE doesn't expect that. This patch turns
off TARGET_OS_IOS when TARGET_OS_MACCATALYST is on, just to get ANGLE to build.
The long-term fix is to either update all the sites to use correct macros, or to
use the ANGLE_PLATFORM_* defines instead.

• src/common/platform.h:

Location:

trunk/Source/ThirdParty/ANGLE

Files:

• ChangeLog (modified) (1 diff)
• src/common/platform.h (modified) (1 diff)

trunk/Source/ThirdParty/ANGLE/ChangeLog

@@ +1 @@
+2021-12-07  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [MacCatalyst] Fix build after r286603
+        https://bugs.webkit.org/show_bug.cgi?id=233977
+
+        Unreviewed.
+
+        Previously, TARGET_OS_IOS and TARGET_OS_MACCATALYST were never on at the same time.
+        Now, they're on at the same time, and ANGLE doesn't expect that. This patch turns
+        off TARGET_OS_IOS when TARGET_OS_MACCATALYST is on, just to get ANGLE to build.
+        The long-term fix is to either update all the sites to use correct macros, or to
+        use the ANGLE_PLATFORM_* defines instead.
+
+        * src/common/platform.h:
+
 2021-12-07  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/ThirdParty/ANGLE/src/common/platform.h

@@ -133 +133 @@
 #        if TARGET_OS_MACCATALYST
 #            define ANGLE_PLATFORM_MACCATALYST 1
+#            undef TARGET_OS_IOS
 #        endif
 #    endif