From c24c7457c9da1baa0e16b8802d2d548e9ef7ed59 Mon Sep 17 00:00:00 2001
From: "amardare%qnx.com"
 <amardare%qnx.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 25 Feb 2004 14:53:32 +0000
Subject: [PATCH] Get rid of the special tratment of MOZ_WIDGET_PHOTON in the
 ifdef statements ( it should follow the XP_UNIX instead ) r=ben

git-svn-id: svn://10.0.0.236/trunk@153215 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/xre/nsAppRunner.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp
index 43e83467b16..374cd9e6cdd 100644
--- a/mozilla/toolkit/xre/nsAppRunner.cpp
+++ b/mozilla/toolkit/xre/nsAppRunner.cpp
@@ -1511,7 +1511,7 @@ static PRBool GetWantSplashScreen(int argc, char* argv[], PRBool aDefault)
   int i;
   PRBool dosplash = aDefault;
   // We can't use the command line service here because it isn't running yet
-#if defined(XP_UNIX) && !defined(MOZ_WIDGET_PHOTON) 
+#if defined(XP_UNIX)
   for (i=1; i<argc; i++)
     if ((PL_strcasecmp(argv[i], "-splash") == 0)
         || (PL_strcasecmp(argv[i], "--splash") == 0))
@@ -1682,11 +1682,11 @@ int main(int argc, char* argv[])
 #ifdef MOZ_XUL_APP
   defaultSplash = aAppData.GetSplashEnabled();
 #else
-#ifdef XP_UNIX && !defined(MOZ_WIDGET_PHOTON)
+#ifdef XP_UNIX
   defaultSplash = PR_FALSE;
 #else
   defaultSplash = PR_TRUE;
-#endif /* XP_UNIX && !defined(MOZ_WIDGET_PHOTON) */
+#endif /* XP_UNIX */
 #endif /* MOZ_XUL_APP */
 
   PRBool dosplash = GetWantSplashScreen(argc, argv, defaultSplash);