[ros-diffs] [reactos] 03/03: [MSXML3] Handle libxml2 API breakage. CORE-15280

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4a8afe55deb052bdabfa…

commit b4a8afe55deb052bdabfacb76e79b95053ae7b91
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sat Dec 1 20:57:10 2018 +0100
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Wed Jan 16 09:27:30 2019 +0100

    [MSXML3] Handle libxml2 API breakage. CORE-15280
    
    Imports Wine commit 2a8719d280c.
---
 dll/win32/msxml3/schema.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dll/win32/msxml3/schema.c b/dll/win32/msxml3/schema.c
index d603d74218..4c92bfbaa9 100644
--- a/dll/win32/msxml3/schema.c
+++ b/dll/win32/msxml3/schema.c
@@ -52,6 +52,12 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
+#if LIBXML_VERSION >= 20908
+#define XMLHASH_CONST const
+#else
+#define XMLHASH_CONST
+#endif
+
 /* We use a chained hashtable, which can hold any number of schemas
  * TODO: grow/shrink hashtable depending on load factor
  * TODO: implement read-only where appropriate
@@ -980,7 +986,7 @@ static cache_entry* cache_entry_from_url(VARIANT url, xmlChar const*
nsURI, MSXM
     return entry;
 }
 
-static void cache_free(void* data, xmlChar* name /* ignored */)
+static void cache_free(void* data, XMLHASH_CONST xmlChar* name /* ignored */)
 {
     cache_entry_release((cache_entry*)data);
 }
@@ -1397,7 +1403,7 @@ static HRESULT WINAPI
schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if
     return S_OK;
 }
 
-static void cache_copy(void* data, void* dest, xmlChar* name)
+static void cache_copy(void* data, void* dest, XMLHASH_CONST xmlChar* name)
 {
     schema_cache* This = (schema_cache*) dest;
     cache_entry* entry = (cache_entry*) data;