From 1c6b7d81618a943be9b1c0720bc0032b34b2876a Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Thu, 16 Jun 2011 23:26:53 -0500
Subject: [PATCH] unimrcp vs2010 upgrade with revert of incorrect 2008 changes
 - still not working

---
 libs/apr-util/xml/expat/lib/config.hnw        |  1 -
 .../libs/apr-toolkit/aprtoolkit.2010.vcxproj  | 14 +++++++---
 libs/unimrcp/libs/mpf/mpf.2010.vcxproj        |  2 --
 .../libs/mrcp-client/mrcpclient.2010.vcxproj  |  1 +
 libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj      |  6 ++++
 libs/win32/apr-util/libaprutil.2008.vcproj    | 28 +++----------------
 6 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/libs/apr-util/xml/expat/lib/config.hnw b/libs/apr-util/xml/expat/lib/config.hnw
index 0878fa208b..de129d343c 100644
--- a/libs/apr-util/xml/expat/lib/config.hnw
+++ b/libs/apr-util/xml/expat/lib/config.hnw
@@ -19,6 +19,5 @@
 #define XML_DTD 1
 #define XML_BYTE_ORDER 12
 #define XML_CONTEXT_BYTES 1024
-#define VERSION 1
 
 #endif /* ndef CONFIG_HNW */
diff --git a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj
index 9288736c40..5a8627dbff 100644
--- a/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj
+++ b/libs/unimrcp/libs/apr-toolkit/aprtoolkit.2010.vcxproj
@@ -110,40 +110,46 @@
     <ClInclude Include="include\apt_consumer_task.h" />
     <ClInclude Include="include\apt_cyclic_queue.h" />
     <ClInclude Include="include\apt_dir_layout.h" />
+    <ClInclude Include="include\apt_header_field.h" />
     <ClInclude Include="include\apt_log.h" />
+    <ClInclude Include="include\apt_multipart_content.h" />
     <ClInclude Include="include\apt_net.h" />
-    <ClInclude Include="include\apt_net_client_task.h" />
-    <ClInclude Include="include\apt_net_server_task.h" />
     <ClInclude Include="include\apt_nlsml_doc.h" />
     <ClInclude Include="include\apt_obj_list.h" />
     <ClInclude Include="include\apt_pair.h" />
     <ClInclude Include="include\apt_pollset.h" />
+    <ClInclude Include="include\apt_poller_task.h" />
     <ClInclude Include="include\apt_pool.h" />
     <ClInclude Include="include\apt_string.h" />
     <ClInclude Include="include\apt_string_table.h" />
     <ClInclude Include="include\apt_task.h" />
     <ClInclude Include="include\apt_task_msg.h" />
     <ClInclude Include="include\apt_test_suite.h" />
+    <ClInclude Include="include\apt_text_message.h" />
     <ClInclude Include="include\apt_text_stream.h" />
+    <ClInclude Include="include\apt_time_queue.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\apt_consumer_task.c" />
     <ClCompile Include="src\apt_cyclic_queue.c" />
     <ClCompile Include="src\apt_dir_layout.c" />
+    <ClCompile Include="src\apt_header_field.c" />
     <ClCompile Include="src\apt_log.c" />
+    <ClCompile Include="src\apt_multipart_content.c" />
     <ClCompile Include="src\apt_net.c" />
-    <ClCompile Include="src\apt_net_client_task.c" />
-    <ClCompile Include="src\apt_net_server_task.c" />
     <ClCompile Include="src\apt_nlsml_doc.c" />
     <ClCompile Include="src\apt_obj_list.c" />
     <ClCompile Include="src\apt_pair.c" />
+    <ClCompile Include="src\apt_poller_task.c" />
     <ClCompile Include="src\apt_pollset.c" />
     <ClCompile Include="src\apt_pool.c" />
     <ClCompile Include="src\apt_string_table.c" />
     <ClCompile Include="src\apt_task.c" />
     <ClCompile Include="src\apt_task_msg.c" />
     <ClCompile Include="src\apt_test_suite.c" />
+    <ClCompile Include="src\apt_text_message.c" />
     <ClCompile Include="src\apt_text_stream.c" />
+    <ClCompile Include="src\apt_timer_queue.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\win32\apr-util\libaprutil.2010.vcxproj">
diff --git a/libs/unimrcp/libs/mpf/mpf.2010.vcxproj b/libs/unimrcp/libs/mpf/mpf.2010.vcxproj
index 1b48acef80..2a89b638c5 100644
--- a/libs/unimrcp/libs/mpf/mpf.2010.vcxproj
+++ b/libs/unimrcp/libs/mpf/mpf.2010.vcxproj
@@ -141,7 +141,6 @@
     <ClCompile Include="src\mpf_stream.c" />
     <ClCompile Include="src\mpf_termination.c" />
     <ClCompile Include="src\mpf_termination_factory.c" />
-    <ClCompile Include="src\mpf_timer_manager.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="codecs\g711\g711.h" />
@@ -184,7 +183,6 @@
     <ClInclude Include="include\mpf_stream_descriptor.h" />
     <ClInclude Include="include\mpf_termination.h" />
     <ClInclude Include="include\mpf_termination_factory.h" />
-    <ClInclude Include="include\mpf_timer_manager.h" />
     <ClInclude Include="include\mpf_types.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj b/libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj
index 1c861d58b5..7a9d7856c6 100644
--- a/libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj
+++ b/libs/unimrcp/libs/mrcp-client/mrcpclient.2010.vcxproj
@@ -112,6 +112,7 @@
     <ClInclude Include="include\mrcp_client_types.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="src\mrcp_application.c" />
     <ClCompile Include="src\mrcp_client.c" />
     <ClCompile Include="src\mrcp_client_session.c" />
   </ItemGroup>
diff --git a/libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj b/libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj
index e525a96146..ed2c29bbf8 100644
--- a/libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj
+++ b/libs/unimrcp/libs/mrcp/mrcp.2010.vcxproj
@@ -113,6 +113,7 @@
     <ClInclude Include="include\mrcp.h" />
     <ClInclude Include="include\mrcp_types.h" />
     <ClInclude Include="message\include\mrcp_generic_header.h" />
+    <ClInclude Include="message\include\mrcp__header.h" />
     <ClInclude Include="message\include\mrcp_header_accessor.h" />
     <ClInclude Include="message\include\mrcp_message.h" />
     <ClInclude Include="message\include\mrcp_start_line.h" />
@@ -126,9 +127,12 @@
     <ClInclude Include="resources\include\mrcp_recorder_resource.h" />
     <ClInclude Include="resources\include\mrcp_synth_header.h" />
     <ClInclude Include="resources\include\mrcp_synth_resource.h" />
+    <ClInclude Include="resources\include\mrcp_verifier_header.h" />
+    <ClInclude Include="resources\include\mrcp_verifier_resource.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="message\src\mrcp_generic_header.c" />
+    <ClCompile Include="message\src\mrcp_header.c" />
     <ClCompile Include="message\src\mrcp_header_accessor.c" />
     <ClCompile Include="message\src\mrcp_message.c" />
     <ClCompile Include="message\src\mrcp_start_line.c" />
@@ -141,6 +145,8 @@
     <ClCompile Include="resources\src\mrcp_recorder_resource.c" />
     <ClCompile Include="resources\src\mrcp_synth_header.c" />
     <ClCompile Include="resources\src\mrcp_synth_resource.c" />
+    <ClCompile Include="resources\src\mrcp_verifier_header.c" />
+    <ClCompile Include="resources\src\mrcp_verifier_resource.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/libs/win32/apr-util/libaprutil.2008.vcproj b/libs/win32/apr-util/libaprutil.2008.vcproj
index 9125bcb5ac..971b97e8d4 100644
--- a/libs/win32/apr-util/libaprutil.2008.vcproj
+++ b/libs/win32/apr-util/libaprutil.2008.vcproj
@@ -52,7 +52,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHsc "
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-util\xml\expat\lib&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
+				AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
 				PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"
@@ -150,7 +150,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHsc "
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-util\xml\expat\lib&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
+				AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
 				PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				RuntimeLibrary="3"
 				PrecompiledHeaderFile="$(IntDir)/libaprutil.pch"
@@ -246,7 +246,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-util\xml\expat\lib&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
+				AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
 				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -347,7 +347,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-util\xml\expat\lib&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
+				AdditionalIncludeDirectories="&quot;..\..\apr-util\include&quot;;&quot;..\..\apr-util\include/private&quot;;&quot;..\..\apr-util\dbm/sdbm&quot;;&quot;..\..\apr-iconv-1.1.1\include&quot;;..\..\apr\include"
 				PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -2391,26 +2391,6 @@
 					</FileConfiguration>
 				</File>
 			</Filter>
-			<Filter
-				Name="xml"
-				>
-				<File
-					RelativePath="..\..\apr-util\xml\apr_xml.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\apr-util\xml\expat\lib\xmlparse.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\apr-util\xml\expat\lib\xmlrole.c"
-					>
-				</File>
-				<File
-					RelativePath="..\..\apr-util\xml\expat\lib\xmltok.c"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Generated Files"