Index: base/mac/mac_util.h |
diff --git a/base/mac/mac_util.h b/base/mac/mac_util.h |
index 4fefe6c5ee80976d9788193dbd5e1c9b6a2c6d29..a308ccd8635f74548e3e4335f5027a3a0e297e9c 100644 |
--- a/base/mac/mac_util.h |
+++ b/base/mac/mac_util.h |
@@ -138,12 +138,18 @@ BASE_EXPORT bool IsOSSnowLeopardOrLater(); |
// Lion is Mac OS X 10.7, Darwin 11. |
BASE_EXPORT bool IsOSLion(); |
+BASE_EXPORT bool IsOSLionOrEarlier(); |
BASE_EXPORT bool IsOSLionOrLater(); |
+// Mountain Lion is Mac OS X 10.8, Darwin 12. |
+BASE_EXPORT bool IsOSMountainLion(); |
+BASE_EXPORT bool IsOSMountainLionOrLater(); |
+ |
// This should be infrequently used. It only makes sense to use this to avoid |
// codepaths that are very likely to break on future (unreleased, untested, |
// unborn) OS releases. |
-BASE_EXPORT bool IsOSLaterThanLion(); |
+BASE_EXPORT |
+ bool IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement(); |
Avi (use Gerrit)
2012/03/14 17:00:52
Alternatively, drop this and give me IsOSMountainL
|
// When the deployment target is set, the code produced cannot run on earlier |
// OS releases. That enables some of the IsOS* family to be implemented as |
@@ -170,7 +176,23 @@ inline bool IsOSLionOrLater() { return true; } |
MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_7 |
#define BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7 |
inline bool IsOSLion() { return false; } |
-inline bool IsOSLaterThanLion() { return true; } |
+inline bool IsOSLionOrEarlier() { return false; } |
+#endif |
+ |
+#if defined(MAC_OS_X_VERSION_10_8) && \ |
+ MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8 |
+#define BASE_MAC_MAC_UTIL_H_INLINED_GE_10_8 |
+inline bool IsOSMountainLionOrLater() { return true; } |
+#endif |
+ |
+#if defined(MAC_OS_X_VERSION_10_8) && \ |
+ MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8 |
+#define BASE_MAC_MAC_UTIL_H_INLINED_GT_10_8 |
+inline bool IsOSMountainLion() { return false; } |
+inline bool IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement() |
+{ |
+ return true; |
+} |
#endif |
// Retrieve the system's model identifier string from the IOKit registry: |