From d4634aba3d8acb36f2a5c2384ecd8ac9e6f8790f Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Tue, 6 Nov 2001 15:39:06 +0000 Subject: [PATCH] Ifdefs for mach-o build. We do too have a splash screen. r=beard/rs=sfraser. git-svn-id: svn://10.0.0.236/trunk@107457 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/bootstrap/nsAppRunner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp index 05879e6c7e0..f7a8233df70 100644 --- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp +++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp @@ -279,7 +279,7 @@ static char *sWatcherServiceContractID = "@mozilla.org/embedcomp/window-watcher; /*********************************************/ // Default implemenations for nativeAppSupport // If your platform implements these functions if def out this code. -#if !defined (XP_MAC ) && !defined(NTO) && !defined( XP_PC ) && !defined( XP_BEOS ) +#if !defined (XP_MAC ) && !defined(XP_MACOSX) && !defined(NTO) && !defined( XP_PC ) && !defined( XP_BEOS ) nsresult NS_CreateSplashScreen( nsISplashScreen **aResult ) { @@ -1504,7 +1504,7 @@ static PRBool GetWantSplashScreen(int argc, char* argv[]) int i; PRBool dosplash; // We can't use the command line service here because it isn't running yet -#if defined(XP_UNIX) && !defined(NTO) +#if defined(XP_UNIX) && !defined(NTO) && !defined(XP_MACOSX) dosplash = PR_FALSE; for (i=1; i