#
#
# patch "paths.cc"
#  from [6d7a9369af3c2a54c001d8199c7133a64ce78193]
#    to [776222c4f6adab74994b4927216363aa65ab3abc]
# 
# patch "visualc/botan.vcproj"
#  from [fb2f58d385186f645c21de7bd120dfe54b6a1a9e]
#    to [4a1ae75c8f5810a7470b7a6561b05b4560a2eb9b]
# 
# patch "visualc/lua.vcproj"
#  from [d1a29591029c803240ab2184caaa880b36f87b3d]
#    to [4bbeb787df68bb2825ae5e8373fae96f7ad8daac]
# 
# patch "visualc/monotone.vcproj"
#  from [14a2215a6cdba56f9af9a2d679fdc450e84cf63e]
#    to [714f96ce8c6645b55723670c82d7f2182fa4ffde]
# 
# patch "visualc/netxx.vcproj"
#  from [2911d9fb6a2ce97c5c2e51c7d97ce0dee49e5995]
#    to [9242650bf3936a70b99ed1d716c89095f2b715b4]
# 
# patch "visualc/sqlite3.vcproj"
#  from [1f360cfe6a8fd1d63b8a4369f864f613224444d4]
#    to [4d9e8ccc227193c4b0f76afe04011c17c1eb75e2]
# 
# patch "visualc/tester.vcproj"
#  from [ef7eb6c66a7426ad7ce5ae3b56f12c95248d297b]
#    to [49878f09ea1d9ec9a03ab5ed1ce7e1919e109f6b]
#
============================================================
--- paths.cc	6d7a9369af3c2a54c001d8199c7133a64ce78193
+++ paths.cc	776222c4f6adab74994b4927216363aa65ab3abc
@@ -847,24 +847,25 @@ find_and_go_to_workspace(string const & 
   if (search_root.empty())
     {
 #ifdef WIN32
-      current = get_current_working_dir();
-      if (current[0] == '/' || current[0] == '\\')
+      std::string cur_str = get_current_working_dir();
+      current = cur_str;
+      if (cur_str[0] == '/' || cur_str[0] == '\\')
         {
-          if (current.size() > 1 && (current[1] == '/' || current[1] == '\\'))
+          if (cur_str.size() > 1 && (cur_str[1] == '/' || cur_str[1] == '\\'))
             {
               // UNC name
-              string::size_type uncend = current.find_first_of("\\/", 2);
+              string::size_type uncend = cur_str.find_first_of("\\/", 2);
               if (uncend == string::npos)
-                root = system_path(current + "/");
+                root = system_path(cur_str + "/");
               else
-                root = system_path(current.substr(0, uncend));
+                root = system_path(cur_str.substr(0, uncend));
             }
           else
             root = system_path("/");
         }
-      else if (current.size() > 1 && current[1] == ':')
+      else if (cur_str.size() > 1 && cur_str[1] == ':')
         {
-          root = system_path(current.substr(0,2) + "/");
+          root = system_path(cur_str.substr(0,2) + "/");
         }
       else I(false);
 #else
============================================================
--- visualc/botan.vcproj	fb2f58d385186f645c21de7bd120dfe54b6a1a9e
+++ visualc/botan.vcproj	4a1ae75c8f5810a7470b7a6561b05b4560a2eb9b
@@ -113,6 +113,7 @@
 				AdditionalIncludeDirectories=""$(ProjectDir)\..";"$(ProjectDir)""
 				PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE"
 				StringPooling="true"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
============================================================
--- visualc/lua.vcproj	d1a29591029c803240ab2184caaa880b36f87b3d
+++ visualc/lua.vcproj	4bbeb787df68bb2825ae5e8373fae96f7ad8daac
@@ -113,6 +113,7 @@
 				AdditionalIncludeDirectories=""$(ProjectDir)\..\visualc""
 				PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE"
 				StringPooling="true"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
============================================================
--- visualc/monotone.vcproj	14a2215a6cdba56f9af9a2d679fdc450e84cf63e
+++ visualc/monotone.vcproj	714f96ce8c6645b55723670c82d7f2182fa4ffde
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..\lua";"$(ProjectDir)\..\sqlite";"$(ProjectDir)\..""
+				AdditionalIncludeDirectories=""$(ProjectDir)";"$(ProjectDir)\..\lua";;"$(ProjectDir)\..""
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_MSVC_STD_ITERATOR;_CRT_SECURE_NO_DEPRECATE;min=min;max=max"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -65,8 +65,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib"
-				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib libiconv.lib libcharset.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
+				AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib "
+				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib iconvD.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
 				OutputFile="$(outdir)\mtn.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
@@ -132,10 +132,11 @@
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\..\lua&quot;;&quot;$(ProjectDir)\..\sqlite&quot;;&quot;$(ProjectDir)\..&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\..\lua&quot;;&quot;$(ProjectDir)\..&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE;BOOST_MSVC_STD_ITERATOR;_CRT_SECURE_NO_DEPRECATE;min=min;max=max"
 				StringPooling="true"
 				MinimalRebuild="true"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="false"
 				UsePrecompiledHeader="1"
 				PrecompiledHeaderThrough="pch.hh"
@@ -156,8 +157,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib"
-				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib libiconv.lib libcharset.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
+				AdditionalOptions="/NODEFAULTLIB:LIBCMT.lib"
+				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib iconv.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
 				OutputFile="$(outdir)/mtn.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
============================================================
--- visualc/netxx.vcproj	2911d9fb6a2ce97c5c2e51c7d97ce0dee49e5995
+++ visualc/netxx.vcproj	9242650bf3936a70b99ed1d716c89095f2b715b4
@@ -112,6 +112,7 @@
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\visualc&quot;;&quot;$(ProjectDir)\..&quot;"
 				PreprocessorDefinitions="WIN32;_CONSOLE;NETXX_NO_INET6;NETXX_NO_PTON;NETXX_NO_NTOP"
 				StringPooling="true"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
============================================================
--- visualc/sqlite3.vcproj	1f360cfe6a8fd1d63b8a4369f864f613224444d4
+++ visualc/sqlite3.vcproj	4d9e8ccc227193c4b0f76afe04011c17c1eb75e2
@@ -113,6 +113,7 @@
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\visualc&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_MBCS;_CONSOLE;SQLITE_OMIT_CURSOR"
 				StringPooling="true"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -226,6 +227,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\sqlite\malloc.c"
+				>
+			</File>
+			<File
 				RelativePath="..\sqlite\opcodes.c"
 				>
 			</File>
============================================================
--- visualc/tester.vcproj	ef7eb6c66a7426ad7ce5ae3b56f12c95248d297b
+++ visualc/tester.vcproj	49878f09ea1d9ec9a03ab5ed1ce7e1919e109f6b
@@ -126,7 +126,7 @@
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
 				MinimalRebuild="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"