diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-12-15 15:09:30 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-12-15 15:09:30 +0000 |
| commit | dabdec3b3ae9cd920e9fe75622a10ce290552941 (patch) | |
| tree | 4d462fe7a5f314369f373f6a42214bc9c0efbfcb /xpcom | |
| parent | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (diff) | |
| parent | cd17592001225e2d988c3aca9bd700de3c8ce4a3 (diff) | |
| download | UXP-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 'xpcom')
| -rw-r--r-- | xpcom/components/ManifestParser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp index b69a204ba..0427303d5 100644 --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp @@ -541,8 +541,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); |