change from bool to PRBool. move mac commandline service before XPCom initialization

This commit is contained in:
davidm%netscape.com 1999-09-03 23:41:26 +00:00
Родитель 1a97985a7e
Коммит d335f25869
3 изменённых файлов: 17 добавлений и 9 удалений

Просмотреть файл

@ -135,9 +135,9 @@ void NS_HideSplashScreen()
{ {
} }
bool NS_CanRun() PRBool NS_CanRun()
{ {
return true; return PR_TRUE;
} }
#endif #endif
/* /*
@ -152,6 +152,9 @@ static int TranslateReturnValue(nsresult aResult)
return 1; return 1;
} }
#ifdef XP_MAC
#include "nsCommandLineServiceMac.h"
#endif
extern "C" void NS_SetupRegistry_1(); extern "C" void NS_SetupRegistry_1();
@ -747,7 +750,11 @@ static nsresult main1(int argc, char* argv[])
#if XP_MAC #if XP_MAC
stTSMCloser tsmCloser; stTSMCloser tsmCloser;
InitializeMacCommandLine( argc, argv);
#endif #endif
// XXX: This call will be replaced by a registry initialization... // XXX: This call will be replaced by a registry initialization...
NS_SetupRegistry_1(); NS_SetupRegistry_1();

Просмотреть файл

@ -17,8 +17,9 @@
* Netscape Communications Corporation. All Rights Reserved. * Netscape Communications Corporation. All Rights Reserved.
*/ */
#include "prtypes.h"
void NS_ShowSplashScreen(); void NS_ShowSplashScreen();
void NS_HideSplashScreen(); void NS_HideSplashScreen();
bool NS_CanRun(); PRBool NS_CanRun();

Просмотреть файл

@ -49,14 +49,14 @@ void NS_HideSplashScreen()
} }
} }
bool NS_CanRun() PRBool NS_CanRun()
{ {
long response = 0; long response = 0;
OSErr err = ::Gestalt (gestaltSystemVersion, &response); OSErr err = ::Gestalt (gestaltSystemVersion, &response);
if ( err || response < 0x850) if ( err || response < 0x850)
{ {
::StopAlert (5000, NULL); ::StopAlert (5000, NULL);
return false; return PR_FALSE;
} }
return true; return PR_TRUE;
} }