Title: [254732] trunk/Source/WTF
- Revision
- 254732
- Author
- [email protected]
- Date
- 2020-01-16 19:03:12 -0800 (Thu, 16 Jan 2020)
Log Message
Fix the build after r254701
<rdar://problem/58667355>
* wtf/Platform.h:
* wtf/PlatformEnable.h:
AdditionalFeatureDefines has to come first.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (254731 => 254732)
--- trunk/Source/WTF/ChangeLog 2020-01-17 01:30:05 UTC (rev 254731)
+++ trunk/Source/WTF/ChangeLog 2020-01-17 03:03:12 UTC (rev 254732)
@@ -1,3 +1,12 @@
+2020-01-16 Tim Horton <[email protected]>
+
+ Fix the build after r254701
+ <rdar://problem/58667355>
+
+ * wtf/Platform.h:
+ * wtf/PlatformEnable.h:
+ AdditionalFeatureDefines has to come first.
+
2020-01-16 Sam Weinig <[email protected]>
Platform.h is out of control Part 7: Split calling convention macro definitions out of Platform.h and into a new PlatformCallingConventions.h
Modified: trunk/Source/WTF/wtf/Platform.h (254731 => 254732)
--- trunk/Source/WTF/wtf/Platform.h 2020-01-17 01:30:05 UTC (rev 254731)
+++ trunk/Source/WTF/wtf/Platform.h 2020-01-17 03:03:12 UTC (rev 254732)
@@ -73,11 +73,7 @@
#include <WebKitAdditions/AdditionalPlatform.h>
#endif
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/AdditionalFeatureDefines.h>)
-#include <WebKitAdditions/AdditionalFeatureDefines.h>
-#endif
-
#undef WTF_PLATFORM_GUARD_AGAINST_INDIRECT_INCLUSION
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (254731 => 254732)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2020-01-17 01:30:05 UTC (rev 254731)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2020-01-17 03:03:12 UTC (rev 254732)
@@ -69,6 +69,12 @@
#endif
#endif
+/* ==== Platform additions: additions to PlatformEnable.h from outside the main repository ==== */
+
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/AdditionalFeatureDefines.h>)
+#include <WebKitAdditions/AdditionalFeatureDefines.h>
+#endif
+
/* FIXME: Move out the PLATFORM specific rules into platform specific files. */
/* --------- Apple iOS (but not macOS) port --------- */
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
