mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-03 20:49:27 +00:00
2nd parameter of Gestalt() is SInt32, not long. 64-bit fix. b=514996 r=josh
This commit is contained in:
parent
049aeb5f21
commit
c99db74a76
@ -1657,7 +1657,7 @@ nsChromeRegistry::ProcessManifestBuffer(char *buf, PRInt32 length,
|
||||
info.dwMinorVersion);
|
||||
}
|
||||
#elif defined(XP_MACOSX)
|
||||
long majorVersion, minorVersion;
|
||||
SInt32 majorVersion, minorVersion;
|
||||
if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) &&
|
||||
(Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) {
|
||||
nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
|
||||
|
@ -106,7 +106,7 @@ NS_IMETHODIMP nsNativeAppSupportCocoa::Start(PRBool *_retval)
|
||||
{
|
||||
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
|
||||
|
||||
long response = 0;
|
||||
SInt32 response = 0;
|
||||
OSErr err = ::Gestalt (gestaltSystemVersion, &response);
|
||||
response &= 0xFFFF; // The system version is in the low order word
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user