From d335f25869367dec0602647312c6e6d714186957 Mon Sep 17 00:00:00 2001
From: "davidm%netscape.com" <davidm%netscape.com>
Date: Fri, 3 Sep 1999 23:41:26 +0000
Subject: [PATCH] change from bool to PRBool. move mac commandline service
 before XPCom initialization

---
 xpfe/bootstrap/nsAppRunner.cpp           | 17 ++++++++++++-----
 xpfe/bootstrap/nsNativeAppSupport.h      |  3 ++-
 xpfe/bootstrap/nsNativeAppSupportMac.cpp |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/xpfe/bootstrap/nsAppRunner.cpp b/xpfe/bootstrap/nsAppRunner.cpp
index 378dd62c2694..76669addbd6c 100644
--- a/xpfe/bootstrap/nsAppRunner.cpp
+++ b/xpfe/bootstrap/nsAppRunner.cpp
@@ -135,9 +135,9 @@ void NS_HideSplashScreen()
 {
 }
 
-bool NS_CanRun() 
+PRBool NS_CanRun() 
 {
-	return true;
+	return PR_TRUE;
 }
 #endif 
 /*
@@ -152,6 +152,9 @@ static int TranslateReturnValue(nsresult aResult)
   return 1;
 }
 
+#ifdef XP_MAC
+#include "nsCommandLineServiceMac.h"
+#endif
 
 extern "C" void NS_SetupRegistry_1();
 
@@ -745,9 +748,13 @@ static nsresult main1(int argc, char* argv[])
  
   InitFullCircle();
 
-#if XP_MAC 
-  stTSMCloser  tsmCloser;
-#endif
+ #if XP_MAC 
+    stTSMCloser  tsmCloser;
+  
+  InitializeMacCommandLine( argc, argv);
+
+ #endif
+
   // XXX: This call will be replaced by a registry initialization...
   NS_SetupRegistry_1();
 
diff --git a/xpfe/bootstrap/nsNativeAppSupport.h b/xpfe/bootstrap/nsNativeAppSupport.h
index bf41d500e6af..f5aa4ea25f47 100644
--- a/xpfe/bootstrap/nsNativeAppSupport.h
+++ b/xpfe/bootstrap/nsNativeAppSupport.h
@@ -17,8 +17,9 @@
  * Netscape Communications Corporation.  All Rights Reserved.
  */
  
+#include "prtypes.h"
  
 void NS_ShowSplashScreen();
 void NS_HideSplashScreen();
 
-bool NS_CanRun();
+PRBool NS_CanRun();
\ No newline at end of file
diff --git a/xpfe/bootstrap/nsNativeAppSupportMac.cpp b/xpfe/bootstrap/nsNativeAppSupportMac.cpp
index f60e70373c2d..05342d010313 100644
--- a/xpfe/bootstrap/nsNativeAppSupportMac.cpp
+++ b/xpfe/bootstrap/nsNativeAppSupportMac.cpp
@@ -49,14 +49,14 @@ void NS_HideSplashScreen()
 	}
 }
 
-bool NS_CanRun() 
+PRBool NS_CanRun() 
 {
 	long response = 0;
 	OSErr err = ::Gestalt (gestaltSystemVersion, &response);
 	if ( err || response < 0x850)
 	{
 		::StopAlert (5000, NULL);
-		return false;
+		return PR_FALSE;
 	}
-	return true;
+	return PR_TRUE;
 }
\ No newline at end of file