Bug 419916 - "Only package CRT files ifndef MOZ_MEMORY" [p=philringnalda@gmail.com (Phil Ringnalda) r=luser/ted a1.9b4=beltzner]

browser/installer/removed-files.in

@@ -594,15 +594,15 @@ chrome/icons/default/default.xpm
 #endif
 dictionaries/PL.dic
 dictionaries/PL.aff
-#ifdef MOZ_MEMORY
 #ifdef XP_WIN
+#ifdef MOZ_MEMORY
 Microsoft.VC80.CRT.manifest
 msvcm80.dll
 msvcp80.dll
 msvcr80.dll
+#else
+mozcrt19.dll
 #endif
-#endif
-#ifdef XP_WIN
 xpicleanup.exe
 #else
 xpicleanup

browser/installer/windows/packages-static

@@ -42,11 +42,14 @@ bin\xpcom_core.dll
 bin\components\xpinstal.dll
 bin\components\jar50.dll
 #endif
+#ifndef MOZ_MEMORY
 bin\Microsoft.VC80.CRT.manifest
 bin\msvcm80.dll
 bin\msvcp80.dll
 bin\msvcr80.dll
+#else
 bin\mozcrt19.dll
+#endif
 
 [browser]
 ; [Base Browser Files]