Title: [161412] trunk/Source/WebCore
- Revision
- 161412
- Author
- [email protected]
- Date
- 2014-01-07 00:46:53 -0800 (Tue, 07 Jan 2014)
Log Message
Another Mountain Lion build fix.
The Mountain Lion version of NS_DEPRECATED_MAC generates a reference to a nonexistent
availability macro when the introduced and deprecated versions are the same. Follow
AppKit's lead in working around this by defining the macros that will be referenced
for the various possible OS version numbers. This isn't an issue on newer versions of
OS X as the Foundation availability macros expand directly in to __attributes__ rather
than in to the legacy availability maros.
* bindings/objc/WebKitAvailability.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161411 => 161412)
--- trunk/Source/WebCore/ChangeLog 2014-01-07 08:22:04 UTC (rev 161411)
+++ trunk/Source/WebCore/ChangeLog 2014-01-07 08:46:53 UTC (rev 161412)
@@ -1,3 +1,16 @@
+2014-01-07 Mark Rowe <[email protected]>
+
+ Another Mountain Lion build fix.
+
+ The Mountain Lion version of NS_DEPRECATED_MAC generates a reference to a nonexistent
+ availability macro when the introduced and deprecated versions are the same. Follow
+ AppKit's lead in working around this by defining the macros that will be referenced
+ for the various possible OS version numbers. This isn't an issue on newer versions of
+ OS X as the Foundation availability macros expand directly in to __attributes__ rather
+ than in to the legacy availability maros.
+
+ * bindings/objc/WebKitAvailability.h:
+
2014-01-06 Mark Rowe <[email protected]>
Mountain Lion build fix.
Modified: trunk/Source/WebCore/bindings/objc/WebKitAvailability.h (161411 => 161412)
--- trunk/Source/WebCore/bindings/objc/WebKitAvailability.h 2014-01-07 08:22:04 UTC (rev 161411)
+++ trunk/Source/WebCore/bindings/objc/WebKitAvailability.h 2014-01-07 08:46:53 UTC (rev 161412)
@@ -38,6 +38,17 @@
#define __AVAILABILITY_INTERNAL__MAC_TBD __attribute__((availability(macosx,introduced=9876.5)))
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_0
+#define AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_0 DEPRECATED_IN_MAC_OS_X_VERSION_10_0_AND_LATER
+#define AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_1 DEPRECATED_IN_MAC_OS_X_VERSION_10_1_AND_LATER
+#define AVAILABLE_MAC_OS_X_VERSION_10_2_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_2 DEPRECATED_IN_MAC_OS_X_VERSION_10_2_AND_LATER
+#define AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_3 DEPRECATED_IN_MAC_OS_X_VERSION_10_3_AND_LATER
+#define AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_4 DEPRECATED_IN_MAC_OS_X_VERSION_10_4_AND_LATER
+#define AVAILABLE_MAC_OS_X_VERSION_10_5_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5 DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER
+#define AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6 DEPRECATED_IN_MAC_OS_X_VERSION_10_6_AND_LATER
+#define AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_7 DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
+#endif
+
#else
#define WEBKIT_AVAILABLE_MAC(introduced)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
