[[ LibXml291 ]] Tweaks to make revXML compile with libxml 2.9.1 on Windows.

runrevmark · runrevmark · commit badb788bf5db · 2013-09-03T15:29:21.000+01:00
diff --git a/revxml/revxml.vcproj b/revxml/revxml.vcproj
@@ -38,7 +38,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REVXML_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REVXML_EXPORTS;LIBXML_STATIC_FOR_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				UsePrecompiledHeader="0"
@@ -55,6 +55,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="wsock32.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -109,7 +110,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REVXML_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REVXML_EXPORTS;LIBXML_STATIC_FOR_DLL"
 				UsePrecompiledHeader="0"
 				DebugInformationFormat="3"
 			/>
@@ -124,6 +125,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="wsock32.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -164,7 +166,7 @@
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{8E776621-28FF-4FBF-A2F3-F4198EE9F7B7}"
-			RelativePathToProject=".\libxml\libxml.vcproj"
+			RelativePathToProject=".\thirdparty\libxml\libxml.vcproj"
 		/>
 	</References>
 	<Files>
diff --git a/revxml/src/revxml.cpp b/revxml/src/revxml.cpp
@@ -2756,7 +2756,7 @@ EXTERNAL_END_DECLARATIONS
 extern void REVXML_INIT();
 extern void REVXML_QUIT();
 
-extern "C" BOOL WINAPI xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
+extern "C" BOOL XMLCALL xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
 
 BOOL WINAPI DllMain(HINSTANCE tInstance, DWORD dwReason, LPVOID lpReserved)
 {
diff --git a/thirdparty b/thirdparty
@@ -1 +1 @@
-Subproject commit 18fb8542900d49781d72c49eb7d2326c04507ae9
+Subproject commit f5eec954c7a911ac65e1ea376714d07288dbd1c2

Original file line number	Diff line number	Diff line change
`@@ -2756,7 +2756,7 @@ EXTERNAL_END_DECLARATIONS`
`2756`	`2756`	`extern void REVXML_INIT();`
`2757`	`2757`	`extern void REVXML_QUIT();`
`2758`	`2758`
`2759`		`-extern "C" BOOL WINAPI xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);`
	`2759`	`+extern "C" BOOL XMLCALL xmlDllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);`
`2760`	`2760`
`2761`	`2761`	`BOOL WINAPI DllMain(HINSTANCE tInstance, DWORD dwReason, LPVOID lpReserved)`
`2762`	`2762`	`{`