[PATCH v7 2/8] msxml3: Fix compilation errors with Clang 18.

[Grigory Vasilyev]

From: Grigory Vasilyev

---
 dlls/msxml3/domdoc.c        | 4 ++--
 dlls/msxml3/main.c          | 3 ++-
 dlls/msxml3/msxml_private.h | 2 +-
 dlls/msxml3/schema.c        | 4 ++--
 dlls/msxml3/selection.c     | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 2acbffc0a88..e95b5313c16 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -26,7 +26,7 @@
 #include <libxml/parser.h>
 #include <libxml/xmlerror.h>
 #include <libxml/xpathInternals.h>
-# include <libxml/xmlsave.h>
+#include <libxml/xmlsave.h>
 #include <libxml/SAX2.h>
 #include <libxml/parserInternals.h>

@@ -502,7 +502,7 @@ static void LIBXML2_LOG_CALLBACK sax_warning(void* ctx, char const* msg, ...)
     va_end(ap);
 }

-static void sax_serror(void* ctx, xmlErrorPtr err)
+static void sax_serror(void* ctx, xmlError* err)
 {
     LIBXML2_CALLBACK_SERROR(doparse, err);
 }
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index 5e8de1676cf..8f9565d7000 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -22,6 +22,7 @@
 #define COBJMACROS

#include <stdarg.h>
+#include <libxml/globals.h>
 #include <libxml/parser.h>
 #include <libxml/xmlerror.h>
 #include <libxslt/pattern.h>
@@ -77,7 +78,7 @@ void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg,
     wine_dbg_log(dbcl, &__wine_dbch_msxml, caller, "%s", buff);
 }

-void wineXmlCallbackError(char const* caller, xmlErrorPtr err)
+void wineXmlCallbackError(char const* caller, xmlError* err)
 {
     enum __wine_debug_class dbcl;

diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
index 54f54995c76..05f162c3303 100644
--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
@@ -165,7 +165,7 @@ extern MSXML_VERSION xmldoc_version( xmlDocPtr doc );
 extern HRESULT XMLElement_create( xmlNodePtr node, LPVOID *ppObj, BOOL own );

extern void wineXmlCallbackLog(char const* caller, xmlErrorLevel lvl, char const* msg, va_list ap);
-extern void wineXmlCallbackError(char const* caller, xmlErrorPtr err);
+extern void wineXmlCallbackError(char const* caller, xmlError* err);

#define LIBXML2_LOG_CALLBACK WINAPIV __WINE_PRINTF_ATTR(2,3)

diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index b6b790d9894..8be448ebf4b 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -243,7 +243,7 @@ static void LIBXML2_LOG_CALLBACK parser_warning(void* ctx, char const* msg, ...)
     va_end(ap);
 }

-static void parser_serror(void* ctx, xmlErrorPtr err)
+static void parser_serror(void* ctx, xmlError* err)
 {
     LIBXML2_CALLBACK_SERROR(Schema_parse, err);
 }
@@ -273,7 +273,7 @@ static void LIBXML2_LOG_CALLBACK validate_warning(void* ctx, char const* msg, ..
     va_end(ap);
 }

-static void validate_serror(void* ctx, xmlErrorPtr err)
+static void validate_serror(void* ctx, xmlError* err)
 {
     LIBXML2_CALLBACK_SERROR(Schema_validate_tree, err);
 }
diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c
index f94b17379d9..aa7d2864907 100644
--- a/dlls/msxml3/selection.c
+++ b/dlls/msxml3/selection.c
@@ -756,7 +756,7 @@ static void XSLPattern_OP_IGEq(xmlXPathParserContextPtr pctx, int nargs)
     xmlFree(arg2);
 }

-static void query_serror(void* ctx, xmlErrorPtr err)
+static void query_serror(void* ctx, xmlError* err)
 {
     LIBXML2_CALLBACK_SERROR(domselection_create, err);
 }