Module: wine Branch: master Commit: 2a8719d280c9fcb87633f89b1d4c016378a28121 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a8719d280c9fcb87633f89b1...
Author: Thomas Faber thomas.faber@reactos.org Date: Wed Jan 9 12:33:37 2019 +0100
msxml3: Handle libxml2 API breakage.
Signed-off-by: Thomas Faber thomas.faber@reactos.org Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msxml3/schema.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 8087985..e385b9b 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/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;