ManifestParser.cpp (palemoon-29.4.1-source.tar.xz) | : | ManifestParser.cpp (palemoon-29.4.2-source.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 541 | skipping to change at line 541 | |||
#if defined(XP_WIN) | #if defined(XP_WIN) | |||
#pragma warning(push) | #pragma warning(push) | |||
#pragma warning(disable:4996) // VC12+ deprecates GetVersionEx | #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx | |||
OSVERSIONINFO info = { sizeof(OSVERSIONINFO) }; | OSVERSIONINFO info = { sizeof(OSVERSIONINFO) }; | |||
if (GetVersionEx(&info)) { | if (GetVersionEx(&info)) { | |||
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", | nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", | |||
info.dwMajorVersion, | info.dwMajorVersion, | |||
info.dwMinorVersion); | info.dwMinorVersion); | |||
} | } | |||
#pragma warning(pop) | #pragma warning(pop) | |||
#elif defined(MOZ_WIDGET_COCOA) | ||||
SInt32 majorVersion = nsCocoaFeatures::macOSVersionMajor(); | ||||
SInt32 minorVersion = nsCocoaFeatures::macOSVersionMinor(); | ||||
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", | ||||
majorVersion, | ||||
minorVersion); | ||||
#elif defined(MOZ_WIDGET_GTK) | #elif defined(MOZ_WIDGET_GTK) | |||
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", | nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", | |||
gtk_major_version, | gtk_major_version, | |||
gtk_minor_version); | gtk_minor_version); | |||
#endif | #endif | |||
if (XRE_IsContentProcess()) { | if (XRE_IsContentProcess()) { | |||
process = kContent; | process = kContent; | |||
} else { | } else { | |||
process = kMain; | process = kMain; | |||
End of changes. 1 change blocks. | ||||
6 lines changed or deleted | 0 lines changed or added |