Bug 652445 - Remove WinCE code (incl Faststart & nsSplashScreenWin) from toolkit; r=dtownsend

toolkit/components/startup/Makefile.in

@@ -55,7 +55,7 @@ CPPSRCS = \
 ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
 CPPSRCS += nsUserInfoOS2.cpp
 else
-ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))
+ifeq ($(OS_ARCH),WINNT)
 CPPSRCS += nsUserInfoWin.cpp
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))

toolkit/components/startup/nsUserInfoWin.cpp

@@ -56,7 +56,6 @@ NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo)
 NS_IMETHODIMP
 nsUserInfo::GetUsername(char **aUsername)
 {
-#ifndef WINCE
     *aUsername = nsnull;
 
     PRUnichar username[256];
@@ -66,9 +65,8 @@ nsUserInfo::GetUsername(char **aUsername)
         return NS_ERROR_FAILURE;
 
     *aUsername = ToNewUTF8String(nsDependentString(username));
-    if (*aUsername) return NS_OK;
-#endif
-    return NS_ERROR_FAILURE;
+
+    return (*aUsername) ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP