bug 503137 - xpcshell.exe needs an --environ cli option to work with xpcshell unittests on windows mobile r+sr=mrbkap

js/src/xpconnect/shell/Makefile.in

@@ -64,7 +64,8 @@ NSDISTMODE = copy
 
 ifdef _MSC_VER
 ifdef WINCE
-WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
+WIN32_EXE_LDFLAGS += -ENTRY:mainWCRTStartup
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre/
 endif
 endif
 

js/src/xpconnect/shell/xpcshell.cpp

@@ -1565,9 +1565,19 @@ GetCurrentWorkingDirectory(nsAString& workingDirectory)
     return true;
 }
 
+#ifdef WINCE
+#include "nsWindowsWMain.cpp"
+#endif
+
 int
+#ifndef WINCE
 main(int argc, char **argv, char **envp)
 {
+#else
+main(int argc, char **argv)
+{
+	char **envp = 0;
+#endif
 #ifdef XP_MACOSX
     InitAutoreleasePool();
 #endif