--- AE/Installer/trunk/source/installer.cpp	2009/12/30 01:51:38	487
+++ AE/Installer/trunk/source/installer.cpp	2010/01/24 23:58:16	489
@@ -9,8 +9,11 @@
 // TODO: Load credits from text resource file
 // TODO: Clear mod info fields when mod is de-selected
 
-#define DEBUG
-
+//#define DEBUG
+#ifdef WIN32
+//#include <windows.h>
+#define popen _popen
+#endif
 #include "boost/date_time/gregorian/gregorian.hpp"
 #include "boost/date_time/date_parsing.hpp"
 #include "boost/date_time/posix_time/posix_time.hpp"
@@ -1279,9 +1282,9 @@ bool ProcessAEUpdate(Install_info_cfg *c
 		if (exists(strPathToEUFNInstall + strWinGUI))
 		{
 			if (exists((path)strWinGUI))
-				rename((path)strWinGUI, (path)strcat(strTrashDir, strWinGUI));
+				rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
 			if (exists(strWinGUILang))
-				rename((path)strWinGUILang, (path)strcat(strTrashDir, strWinGUILang));
+				rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
 			rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
 			rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
 		}
@@ -1579,12 +1582,12 @@ ModPackage::ModPackage()
 	readme = "";
 	globalNeeded = true;
 }
-
+#ifndef WIN32
 void Sleep(int ms)
 {
 	sleep(ms / 1000);
 }
-
+#endif
 #ifdef WIN32
 
 void RedirectIOToConsole()