From f8f9d03e799ed05da70f628a62f278070fb650d0 Mon Sep 17 00:00:00 2001
From: "davidm%netscape.com"
 <davidm%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 3 Sep 1999 23:41:26 +0000
Subject: [PATCH] change from bool to PRBool. move mac commandline service
 before XPCom initialization

git-svn-id: svn://10.0.0.236/trunk@45972 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/bootstrap/nsAppRunner.cpp          | 17 ++++++++++++-----
 mozilla/xpfe/bootstrap/nsNativeAppSupport.h     |  3 ++-
 .../xpfe/bootstrap/nsNativeAppSupportMac.cpp    |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index 378dd62c269..76669addbd6 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/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/mozilla/xpfe/bootstrap/nsNativeAppSupport.h b/mozilla/xpfe/bootstrap/nsNativeAppSupport.h
index bf41d500e6a..f5aa4ea25f4 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupport.h
+++ b/mozilla/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/mozilla/xpfe/bootstrap/nsNativeAppSupportMac.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportMac.cpp
index f60e70373c2..05342d01031 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupportMac.cpp
+++ b/mozilla/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