fix windows build for last set of commits

libs/win32/util.vbs

@@ -369,11 +369,11 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest)
 
 	Wscript.echo("Checking if we're building a newer git version")
 
-	strVerMajor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MAJOR")
-	strVerMinor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MINOR")
-	strVerMicro = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MICRO")
-	strVerRev   = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_REVISION")
-	strVerHuman = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_REVISION_HUMAN")
+	strVerMajor = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MAJOR")
+	strVerMinor = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MINOR")
+	strVerMicro = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MICRO")
+	strVerRev   = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_REVISION")
+	strVerHuman = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_REVISION_HUMAN")
 
 	'Set version to the one reported by configure.in
 	If strVerRev <> "" Then

libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj

@@ -214,7 +214,7 @@
     <ClCompile Include="..\..\xmlrpc-c\src\registry.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\resource.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\system_method.c" />
-    <ClCompile Include="..\..\xmlrpc-c\src\trace.c" />
+    <ClCompile Include="..\..\xmlrpc-c\src\xml_trace.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\version.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\xmlrpc_array.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\xmlrpc_authcookie.c" />

libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj.filters

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -49,7 +49,7 @@
     <ClCompile Include="..\..\xmlrpc-c\src\registry.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xmlrpc-c\src\trace.c">
+    <ClCompile Include="..\..\xmlrpc-c\src\xml_trace.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xmlrpc-c\src\parse_datetime.c">

libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj

@@ -222,7 +222,7 @@
     <ClCompile Include="..\..\xmlrpc-c\src\registry.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\resource.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\system_method.c" />
-    <ClCompile Include="..\..\xmlrpc-c\src\trace.c" />
+    <ClCompile Include="..\..\xmlrpc-c\src\xml_trace.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\version.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\xmlrpc_array.c" />
     <ClCompile Include="..\..\xmlrpc-c\src\xmlrpc_authcookie.c" />

libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj.filters

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -49,7 +49,7 @@
     <ClCompile Include="..\..\xmlrpc-c\src\registry.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\xmlrpc-c\src\trace.c">
+    <ClCompile Include="..\..\xmlrpc-c\src\xml_trace.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\xmlrpc-c\src\parse_datetime.c">