summaryrefslogtreecommitdiffstats
path: root/xpcom/components
diff options
context:
space:
mode:
authorBrian Smith <brian@dbsoft.org>2020-11-23 08:18:34 -0600
committerBrian Smith <brian@dbsoft.org>2020-11-23 08:18:34 -0600
commitb1ac886a988cab94463c265fccb48229d5e1700e (patch)
tree7ab24da7fc998d7479896f77b4c2cdc135b082f6 /xpcom/components
parenta8a397fbceb78d2338e214e583be4f02797637d1 (diff)
downloadUXP-b1ac886a988cab94463c265fccb48229d5e1700e.tar
UXP-b1ac886a988cab94463c265fccb48229d5e1700e.tar.gz
UXP-b1ac886a988cab94463c265fccb48229d5e1700e.tar.lz
UXP-b1ac886a988cab94463c265fccb48229d5e1700e.tar.xz
UXP-b1ac886a988cab94463c265fccb48229d5e1700e.zip
Issue #1690 - Part 1: Fix MacOS version detection above 10.15.
Changes based on Mozilla bug 1616404 but supporting back to 10.7.
Diffstat (limited to 'xpcom/components')
-rw-r--r--xpcom/components/ManifestParser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
index eea8071c2..f25635428 100644
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -540,8 +540,8 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
}
#pragma warning(pop)
#elif defined(MOZ_WIDGET_COCOA)
- SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
- SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
+ SInt32 majorVersion = nsCocoaFeatures::macOSVersionMajor();
+ SInt32 minorVersion = nsCocoaFeatures::macOSVersionMinor();
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
majorVersion,
minorVersion);