summaryrefslogtreecommitdiffstats
path: root/widget/cocoa/nsCocoaFeatures.h
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-12-15 15:09:30 +0000
committerMoonchild <moonchild@palemoon.org>2020-12-15 15:09:30 +0000
commitdabdec3b3ae9cd920e9fe75622a10ce290552941 (patch)
tree4d462fe7a5f314369f373f6a42214bc9c0efbfcb /widget/cocoa/nsCocoaFeatures.h
parent5165ed02285315cc0bed7977c7bac6d0a90ca43c (diff)
parentcd17592001225e2d988c3aca9bd700de3c8ce4a3 (diff)
downloadUXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.tar
UXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.tar.gz
UXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.tar.lz
UXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.tar.xz
UXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.zip
Merge branch 'redwood' into releaseRC_20201215
Diffstat (limited to 'widget/cocoa/nsCocoaFeatures.h')
-rw-r--r--widget/cocoa/nsCocoaFeatures.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/widget/cocoa/nsCocoaFeatures.h b/widget/cocoa/nsCocoaFeatures.h
index 7ebbe759f..a9cab95d5 100644
--- a/widget/cocoa/nsCocoaFeatures.h
+++ b/widget/cocoa/nsCocoaFeatures.h
@@ -14,10 +14,10 @@
/// is the only call that returns the unadjusted values.
class nsCocoaFeatures {
public:
- static int32_t OSXVersion();
- static int32_t OSXVersionMajor();
- static int32_t OSXVersionMinor();
- static int32_t OSXVersionBugFix();
+ static int32_t macOSVersion();
+ static int32_t macOSVersionMajor();
+ static int32_t macOSVersionMinor();
+ static int32_t macOSVersionBugFix();
static bool OnYosemiteOrLater();
static bool OnElCapitanOrLater();
static bool OnSierraOrLater();
@@ -41,6 +41,6 @@ public:
private:
static void InitializeVersionNumbers();
- static int32_t mOSXVersion;
+ static int32_t mOSVersion;
};
#endif // nsCocoaFeatures_h_