From 8d53dd0302d7e5744244bc8bf03dc49bb94bf042 Mon Sep 17 00:00:00 2001 From: "jst%mozilla.jstenback.com" Date: Fri, 10 Dec 2004 01:06:37 +0000 Subject: [PATCH] Fixing bug 273961. Don't execute unix process creation code on windows. r+sr=darin@meer.net --- xpcom/threads/nsProcessCommon.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpcom/threads/nsProcessCommon.cpp b/xpcom/threads/nsProcessCommon.cpp index dd388178070..4f5629b4947 100644 --- a/xpcom/threads/nsProcessCommon.cpp +++ b/xpcom/threads/nsProcessCommon.cpp @@ -299,7 +299,9 @@ nsProcess::Run(PRBool blocking, const char **args, PRUint32 count, rv = PR_FAILURE; } -#elif defined(XP_MACOSX) +#else // Note, this must not be an #elif ...! + +#if defined(XP_MACOSX) if (count == 0) { FSSpec resolvedSpec; OSErr err = noErr; @@ -366,6 +368,7 @@ nsProcess::Run(PRBool blocking, const char **args, PRUint32 count, NULL); } } +#endif // free up our argv nsMemory::Free(my_argv);