project: Update for 2.14.0 merge.

Author: Sibras

SMP/SMP.patch

@@ -1,30 +1,23 @@
-diff --git a/parser.c b/parser.c
-index 10a1120a..67cce264 100644
---- a/parser.c
-+++ b/parser.c
-@@ -7616,7 +7616,7 @@ xmlHandleUndeclaredEntity(xmlParserCtxtPtr ctxt, const xmlChar *name) {
- 
- static xmlEntityPtr
- xmlLookupGeneralEntity(xmlParserCtxtPtr ctxt, const xmlChar *name, int inAttr) {
--    xmlEntityPtr ent;
-+    xmlEntityPtr ent = NULL;
- 
-     /*
-      * Predefined entities override any extra definition
-@@ -9394,7 +9394,7 @@ next_attr:
- 	if (defaults != NULL) {
- 	    for (i = 0; i < defaults->nbAttrs; i++) {
-                 xmlDefAttr *attr = &defaults->attrs[i];
--                const xmlChar *nsuri;
-+                const xmlChar *nsuri = NULL;
-                 unsigned hashValue, uriHashValue;
-                 int res;
+diff --git a/globals.c b/globals.c
+index 4726505b..8523b686 100644
+--- a/globals.c
++++ b/globals.c
+@@ -77,7 +77,9 @@ static xmlMutex xmlThrDefMutex;
 
+ #ifdef HAVE_WIN32_THREADS
+   #if defined(LIBXML_STATIC) && !defined(LIBXML_STATIC_FOR_DLL)
+-    #define USE_WAIT_DTOR
++    #if !defined(WINAPI_FAMILY_PARTITION) || (!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP))
++      #define USE_WAIT_DTOR
++    #endif
+   #else
+     #define USE_DLL_MAIN
+   #endif
 diff --git a/xmlmodule.c b/xmlmodule.c
-index dd2fd7a5..a80bac1f 100644
+index 407227c1..1379fe14 100644
 --- a/xmlmodule.c
 +++ b/xmlmodule.c
-@@ -267,7 +267,15 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
+@@ -263,7 +263,15 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
  static void *
  xmlModulePlatformOpen(const char *name)
  {
@@ -41,10 +34,10 @@ index dd2fd7a5..a80bac1f 100644
 
  /*
 diff --git a/xpath.c b/xpath.c
-index 485d7747..c3501fb3 100644
+index 7be6cfdc..75b62a87 100644
 --- a/xpath.c
 +++ b/xpath.c
-@@ -8481,7 +8481,7 @@ void
+@@ -8203,7 +8203,7 @@ void
  xmlXPathLangFunction(xmlXPathParserContextPtr ctxt, int nargs) {
      xmlXPathObjectPtr val;
      xmlNodePtr cur;

SMP/config.h

@@ -1,10 +1,6 @@
 #ifndef __LIBXML_WIN32_CONFIG__
 #define __LIBXML_WIN32_CONFIG__
 
-#define HAVE_SYS_STAT_H
-#define HAVE_STAT
-#define HAVE_FCNTL_H
-
 #if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1600)
   #define HAVE_STDINT_H
 #endif
@@ -18,5 +14,7 @@
   #endif
 #endif
 
+#define XML_SYSCONFDIR "/etc"
+
 #endif /* __LIBXML_WIN32_CONFIG__ */
 

SMP/libxml/xmlversion.h

@@ -15,36 +15,36 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.13.7"
+#define LIBXML_DOTTED_VERSION "2.14.0"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20137
+#define LIBXML_VERSION 20140
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20137"
+#define LIBXML_VERSION_STRING "20140"
 
 /**
  * LIBXML_VERSION_EXTRA:
  *
  * extra version information, used to show a git commit description
  */
-#define LIBXML_VERSION_EXTRA "-GITv2.13.7"
+#define LIBXML_VERSION_EXTRA "-GITv2.14.0"
 
 /**
  * LIBXML_TEST_VERSION:
  *
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20137);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20140);
 
 /**
  * LIBXML_THREAD_ENABLED:
@@ -67,11 +67,9 @@
 /**
  * LIBXML_TREE_ENABLED:
  *
- * Whether the DOM like tree manipulation API support is configured in
+ * Always enabled since 2.14.0
  */
-#if 1
 #define LIBXML_TREE_ENABLED
-#endif
 
 /**
  * LIBXML_OUTPUT_ENABLED:
@@ -127,15 +125,6 @@
 #define LIBXML_SAX1_ENABLED
 #endif
 
-/**
- * LIBXML_FTP_ENABLED:
- *
- * Whether the FTP support is configured in
- */
-#if 0
-#define LIBXML_FTP_ENABLED
-#endif
-
 /**
  * LIBXML_HTTP_ENABLED:
  *
@@ -166,11 +155,9 @@
 /**
  * LIBXML_LEGACY_ENABLED:
  *
- * Whether the deprecated APIs are compiled in for compatibility
+ * Removed in 2.14
  */
-#if 1
-#define LIBXML_LEGACY_ENABLED
-#endif
+#undef LIBXML_LEGACY_ENABLED
 
 /**
  * LIBXML_C14N_ENABLED:
@@ -208,15 +195,6 @@
 #define LIBXML_XPTR_ENABLED
 #endif
 
-/**
- * LIBXML_XPTR_LOCS_ENABLED:
- *
- * Whether support for XPointer locations is configured in
- */
-#if 0
-#define LIBXML_XPTR_LOCS_ENABLED
-#endif
-
 /**
  * LIBXML_XINCLUDE_ENABLED:
  *
@@ -265,11 +243,9 @@
 /**
  * LIBXML_UNICODE_ENABLED:
  *
- * Whether the Unicode related interfaces are compiled in
+ * Removed in 2.14
  */
-#if 1
-#define LIBXML_UNICODE_ENABLED
-#endif
+#undef LIBXML_UNICODE_ENABLED
 
 /**
  * LIBXML_REGEXP_ENABLED:
@@ -289,6 +265,15 @@
 #define LIBXML_AUTOMATA_ENABLED
 #endif
 
+/**
+ * LIBXML_RELAXNG_ENABLED:
+ *
+ * Whether the RelaxNG validation interfaces are compiled in
+ */
+#if 1
+#define LIBXML_RELAXNG_ENABLED
+#endif
+
 /**
  * LIBXML_SCHEMAS_ENABLED:
  *

SMP/libxml2.vcxproj.filters

@@ -105,15 +105,9 @@
     <ClCompile Include="..\HTMLtree.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\legacy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\list.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\nanoftp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\nanohttp.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -129,9 +123,6 @@
     <ClCompile Include="..\relaxng.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\SAX.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\SAX2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -359,6 +350,15 @@
     <ClInclude Include="..\include\private\xzlib.h">
       <Filter>Header Files\include\private</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\private\unicode.h">
+      <Filter>Header Files\include\private</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\private\cata.h">
+      <Filter>Header Files\include\private</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\private\lint.h">
+      <Filter>Header Files\include\private</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\win32\libxml2.rc">

SMP/libxml2_files.props

@@ -16,17 +16,14 @@
     <ClCompile Include="..\hash.c" />
     <ClCompile Include="..\HTMLparser.c" />
     <ClCompile Include="..\HTMLtree.c" />
-    <ClCompile Include="..\legacy.c" />
     <ClCompile Include="..\list.c" />
-    <ClCompile Include="..\nanoftp.c" />
     <ClCompile Include="..\nanohttp.c">
       <ForcedIncludeFiles>io.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <ClCompile Include="..\parser.c" />
     <ClCompile Include="..\parserInternals.c" />
     <ClCompile Include="..\pattern.c" />
     <ClCompile Include="..\relaxng.c" />
-    <ClCompile Include="..\SAX.c" />
     <ClCompile Include="..\SAX2.c" />
     <ClCompile Include="..\schematron.c" />
     <ClCompile Include="..\threads.c" />
@@ -100,13 +97,15 @@
     <ClInclude Include="..\include\libxml\xpathInternals.h" />
     <ClInclude Include="..\include\libxml\xpointer.h" />
     <ClInclude Include="..\include\private\buf.h" />
+    <ClInclude Include="..\include\private\cata.h" />
     <ClInclude Include="..\include\private\dict.h" />
     <ClInclude Include="..\include\private\enc.h" />
     <ClInclude Include="..\include\private\entities.h" />
     <ClInclude Include="..\include\private\error.h" />
     <ClInclude Include="..\include\private\globals.h" />
     <ClInclude Include="..\include\private\html.h" />
     <ClInclude Include="..\include\private\io.h" />
+    <ClInclude Include="..\include\private\lint.h" />
     <ClInclude Include="..\include\private\memory.h" />
     <ClInclude Include="..\include\private\parser.h" />
     <ClInclude Include="..\include\private\regexp.h" />
@@ -117,6 +116,7 @@
     <ClInclude Include="..\include\private\xinclude.h" />
     <ClInclude Include="..\include\private\xpath.h" />
     <ClInclude Include="..\include\private\xzlib.h" />
+    <ClInclude Include="..\include\private\unicode.h" />
     <ClInclude Include="..\libxml.h" />
     <ClInclude Include="config.h" />
     <ClInclude Include="libxml\xmlversion.h" />

SMP/libxml2_winrt.vcxproj

@@ -10,7 +10,7 @@
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;LIBXML_STATIC;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;DEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);LIBXML_STATIC;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;DEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -55,7 +55,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;LIBXML_STATIC;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;DEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);LIBXML_STATIC;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;DEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -100,7 +100,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;DEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;DEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -145,7 +145,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;DEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;DEBUG;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -190,7 +190,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;LIBXML_STATIC;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);LIBXML_STATIC;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -235,7 +235,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;LIBXML_STATIC;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);LIBXML_STATIC;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -280,7 +280,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -325,7 +325,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRTStaticDeps|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -370,7 +370,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -415,7 +415,7 @@ del /f /q $(OutDir)\licenses\libxml2.txt
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRTStaticDeps|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>IN_LIBXML;HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>IN_LIBXML;XML_THREAD_LOCAL=__declspec(thread);HAVE_LIBLZMA;HAVE_LZMA_H;HAVE_LIBZ;HAVE_ZLIB_H;HAVE_CONFIG_H;LZMA_API_STATIC;_WINSOCK_DEPRECATED_NO_WARNINGS;LIBXML_STATIC_FOR_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>.\;..\;..\include;$(OutDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4267;4244;4005;4996;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>