#
#
# patch "commands.cc"
#  from [cbfee2e1f2b7482064bc73609ffabd825ec53bc0]
#    to [ded65727f05f111afe1a0f5b13a3a451590d0ed5]
# 
# patch "simplestring_xform.hh"
#  from [79e8cd9358a80d05db87ffd1759ac705ea942d3e]
#    to [954b2e8b8aa8440d75c2f01eb09ee7e079ee5fb6]
# 
# patch "txt2c.cc"
#  from [b53f05ddac34b55e53343efc612c572d9e861b37]
#    to [4bfb199702931f2c6e4729b4b4d6e90af48b66ee]
# 
# patch "visualc/monotone.vcproj"
#  from [8f39ccb9e213d022e4807149d7b834aae4ead4c0]
#    to [14a2215a6cdba56f9af9a2d679fdc450e84cf63e]
# 
# patch "visualc/tester.vcproj"
#  from [63ef1a3ac1a34f71c5def17e03b3a38d0ca9acad]
#    to [ef7eb6c66a7426ad7ce5ae3b56f12c95248d297b]
#
============================================================
--- commands.cc	cbfee2e1f2b7482064bc73609ffabd825ec53bc0
+++ commands.cc	ded65727f05f111afe1a0f5b13a3a451590d0ed5
@@ -328,7 +328,7 @@ namespace commands {
 
     I(!prefix().empty());
 
-    for (children_set::iterator iter = children().begin();
+    for (children_set::const_iterator iter = children().begin();
          iter != children().end(); iter++)
       {
         command * child = *iter;
============================================================
--- simplestring_xform.hh	79e8cd9358a80d05db87ffd1759ac705ea942d3e
+++ simplestring_xform.hh	954b2e8b8aa8440d75c2f01eb09ee7e079ee5fb6
@@ -44,11 +44,11 @@ std::vector< T > split_into_words(T cons
   return out;
 }
 
-template< template< typename > class T1, class T2 >
-T2 join_words(T1< T2 > const & in, std::string const & sep = " ")
+template< class Container >
+typename Container::value_type join_words(Container const & in, std::string const & sep = "")
 {
   std::string str;
-  typename T1< T2 >::const_iterator iter = in.begin();
+  typename Container::const_iterator iter = in.begin();
   while (iter != in.end())
     {
       str += (*iter)();
@@ -56,7 +56,8 @@ T2 join_words(T1< T2 > const & in, std::
       if (iter != in.end())
         str += sep;
     }
-  return T2(str);
+  typedef typename Container::value_type result_type;
+  return result_type(str);
 }
 
 void prefix_lines_with(std::string const & prefix,
============================================================
--- txt2c.cc	b53f05ddac34b55e53343efc612c572d9e861b37
+++ txt2c.cc	4bfb199702931f2c6e4729b4b4d6e90af48b66ee
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
     }
   if (string(argv[i]) == "--no-static")
     {
-      static_decl = "";
+      static_decl = "extern ";
       i++;
     }
   char const * fname = argv[i++];
============================================================
--- visualc/monotone.vcproj	8f39ccb9e213d022e4807149d7b834aae4ead4c0
+++ visualc/monotone.vcproj	14a2215a6cdba56f9af9a2d679fdc450e84cf63e
@@ -69,7 +69,7 @@
 				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib libiconv.lib libcharset.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
 				OutputFile="$(outdir)\mtn.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\Debug&quot;"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(outdir)/visualc.pdb"
 				SubSystem="1"
@@ -160,7 +160,7 @@
 				AdditionalDependencies="botan.lib sqlite3.lib netxx.lib stringprep.lib lua.lib libiconv.lib libcharset.lib ws2_32.lib shell32.lib advapi32.lib zlib.lib"
 				OutputFile="$(outdir)/mtn.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)\Release&quot;"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				GenerateMapFile="false"
 				SubSystem="1"
@@ -591,6 +591,26 @@
 				>
 			</File>
 			<File
+				RelativePath="..\schema.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\schema_migration.cc"
 				>
 			</File>
@@ -615,6 +635,26 @@
 				>
 			</File>
 			<File
+				RelativePath="..\std_hooks.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\string_queue.cc"
 				>
 			</File>
@@ -623,6 +663,26 @@
 				>
 			</File>
 			<File
+				RelativePath="..\test_hooks.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\transforms.cc"
 				>
 			</File>
@@ -639,6 +699,26 @@
 				>
 			</File>
 			<File
+				RelativePath="..\views.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\vocab.cc"
 				>
 			</File>
@@ -1073,10 +1153,10 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating $(ProjectDir)\..\schema.h from $(ProjectDir)\..\schema.sql"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\schema.sql schema &gt;$(ProjectDir)\..\schema.h&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="schema.h"
+					Description="Generating $(ProjectDir)\..\schema.c from $(ProjectDir)\..\schema.sql"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\schema.sql&quot; schema &gt;&quot;$(ProjectDir)\..\schema.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="schema.c"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -1084,13 +1164,18 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\schema.sql schema &gt;$(ProjectDir)\..\schema.h&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="schema.h"
+					Description="Generating $(ProjectDir)\..\schema.c from $(ProjectDir)\..\schema.sql"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\schema.sql&quot; schema &gt;&quot;$(ProjectDir)\..\schema.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="schema.c"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\specialized_lexical_cast.cc"
+			>
+		</File>
+		<File
 			RelativePath="..\std_hooks.lua"
 			>
 			<FileConfiguration
@@ -1098,10 +1183,10 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating $(ProjectDir)\..\std_hooks.h from $(ProjectDir)\..\std_hooks.lua"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\std_hooks.lua std_hooks &gt;$(ProjectDir)\..\std_hooks.h&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="std_hooks.h"
+					Description="Generating $(ProjectDir)\..\std_hooks.c from $(ProjectDir)\..\std_hooks.lua"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\std_hooks.lua&quot; std_hooks &gt;&quot;$(ProjectDir)\..\std_hooks.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="std_hooks.c"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -1109,9 +1194,10 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\std_hooks.lua std_hooks &gt;$(ProjectDir)\..\std_hooks.h&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="std_hooks.h"
+					Description="Generating $(ProjectDir)\..\std_hooks.c from $(ProjectDir)\..\std_hooks.lua"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\std_hooks.lua&quot; std_hooks &gt;&quot;$(ProjectDir)\..\std_hooks.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="std_hooks.c"
 				/>
 			</FileConfiguration>
 		</File>
@@ -1123,10 +1209,10 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating $(ProjectDir)\..\test_hooks.h from $(ProjectDir)\..\test_hooks.lua"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\test_hooks.lua test_hooks &gt;$(ProjectDir)\..\test_hooks.h&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="test_hooks.h"
+					Description="Generating $(ProjectDir)\..\test_hooks.c from $(ProjectDir)\..\test_hooks.lua"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\test_hooks.lua&quot; test_hooks &gt;&quot;$(ProjectDir)\..\test_hooks.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="test_hooks.c"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -1134,9 +1220,10 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\test_hooks.lua test_hooks &gt;$(ProjectDir)\..\test_hooks.h&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="test_hooks.h"
+					Description="Generating $(ProjectDir)\..\test_hooks.c from $(ProjectDir)\..\test_hooks.lua"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\test_hooks.lua&quot; test_hooks &gt;&quot;$(ProjectDir)\..\test_hooks.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="test_hooks.c"
 				/>
 			</FileConfiguration>
 		</File>
@@ -1149,8 +1236,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Writing package_full_revision.cc"
-					CommandLine="copy $(ProjectDir)\..\_MTN\revision $(ProjectDir)\..\package_revision.txt&#x0D;&#x0A;$(TargetDir)\txt2c.exe --strip-trailing --no-static $(ProjectDir)\unknown_package.txt package_full_revision &gt;$(ProjectDir)\..\package_full_revision.cc&#x0D;&#x0A;$(TargetDir)\txt2c.exe --strip-trailing --no-static $(ProjectDir)\..\package_revision.txt package_revision &gt;$(ProjectDir)\..\package_revision.cc&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
+					CommandLine="copy &quot;$(ProjectDir)\..\_MTN\revision&quot; &quot;$(ProjectDir)\..\package_revision.txt&quot;&#x0D;&#x0A;&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\unknown_package.txt&quot; package_full_revision &gt;&quot;$(ProjectDir)\..\package_full_revision.cc&quot;&#x0D;&#x0A;&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\package_revision.txt&quot; package_revision &gt;&quot;$(ProjectDir)\..\package_revision.cc&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
 					Outputs="package_full_revision.cc;package_revision.cc"
 				/>
 			</FileConfiguration>
@@ -1159,7 +1246,8 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="copy $(ProjectDir)\..\MT\revision $(ProjectDir)\..\package_revision.txt&#x0D;&#x0A;$(TargetDir)\txt2c.exe --strip-trailing --no-static $(ProjectDir)\unknown_package.txt package_full_revision &gt;$(ProjectDir)\..\package_full_revision.cc&#x0D;&#x0A;$(TargetDir)\txt2c.exe --strip-trailing --no-static $(ProjectDir)\..\package_revision.txt package_revision &gt;$(ProjectDir)\..\package_revision.cc&#x0D;&#x0A;"
+					Description="Writing package_full_revision.cc"
+					CommandLine="copy &quot;$(ProjectDir)\..\_MTN\revision&quot; &quot;$(ProjectDir)\..\package_revision.txt&quot;&#x0D;&#x0A;&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\unknown_package.txt&quot; package_full_revision &gt;&quot;$(ProjectDir)\..\package_full_revision.cc&quot;&#x0D;&#x0A;&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\package_revision.txt&quot; package_revision &gt;&quot;$(ProjectDir)\..\package_revision.cc&quot;&#x0D;&#x0A;"
 					AdditionalDependencies="$(TargetDir)\txt2c.exe"
 					Outputs="package_full_revision.cc;package_revision.cc"
 				/>
@@ -1173,10 +1261,10 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating $(ProjectDir)\..\views.h from $(ProjectDir)\..\views.sql"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\views.sql views &gt;$(ProjectDir)\..\views.h&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="views.h"
+					Description="Generating $(ProjectDir)\..\views.c from $(ProjectDir)\..\views.sql"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\views.sql&quot; views &gt;&quot;$(ProjectDir)\..\views.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="views.c"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -1184,9 +1272,10 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\views.sql views &gt;$(ProjectDir)\..\views.h&#x0D;&#x0A;"
+					Description="Generating $(ProjectDir)\..\views.c from $(ProjectDir)\..\views.sql"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\views.sql&quot; views &gt;&quot;$(ProjectDir)\..\views.c&quot;&#x0D;&#x0A;"
 					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="views.h"
+					Outputs="views.c"
 				/>
 			</FileConfiguration>
 		</File>
============================================================
--- visualc/tester.vcproj	63ef1a3ac1a34f71c5def17e03b3a38d0ca9acad
+++ visualc/tester.vcproj	ef7eb6c66a7426ad7ce5ae3b56f12c95248d297b
@@ -63,7 +63,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="botan.lib lua.lib stringprep.lib libiconv.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)\Debug&quot;"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -147,7 +147,7 @@
 				AdditionalOptions="/NODEFAULTLIB:LIBCMTD.lib"
 				AdditionalDependencies="botan.lib lua.lib stringprep.lib libiconv.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;$(ProjectDir)\Release&quot;"
+				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -261,6 +261,26 @@
 				>
 			</File>
 			<File
+				RelativePath="..\testlib.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
 				RelativePath="..\vocab.cc"
 				>
 			</File>
@@ -350,17 +370,28 @@
 			>
 		</Filter>
 		<File
-			RelativePath="..\tester.lua"
+			RelativePath="..\testlib.lua"
 			>
 			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="txt2c testlib.lua"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\testlib.lua&quot; testlib &gt;&quot;$(ProjectDir)\..\testlib.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="testlib.c"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
 				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="txt2c tester.lua"
-					CommandLine="$(TargetDir)\txt2c.exe --strip-trailing $(ProjectDir)\..\tester.lua tester &gt;$(ProjectDir)\..\tester.h&#x0D;&#x0A;"
-					AdditionalDependencies="$(TargetDir)\txt2c.exe"
-					Outputs="tester.h"
+					Description="txt2c testlib.lua"
+					CommandLine="&quot;$(TargetDir)\txt2c.exe&quot; --strip-trailing --no-static &quot;$(ProjectDir)\..\testlib.lua&quot; testlib &gt;&quot;$(ProjectDir)\..\testlib.c&quot;&#x0D;&#x0A;"
+					AdditionalDependencies="&quot;$(TargetDir)\txt2c.exe&quot;"
+					Outputs="testlib.c"
 				/>
 			</FileConfiguration>
 		</File>