Alexandre Julliard : xml2: Revert some calling convention changes.
Alexandre Julliard
julliard at winehq.org
Mon Mar 7 16:04:58 CST 2022
Module: wine
Branch: master
Commit: 5eb5d81793dcbee67c89fcaa9d7dc4b2ed9a8d98
URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb5d81793dcbee67c89fcaa9d7dc4b2ed9a8d98
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Mar 7 20:41:50 2022 +0100
xml2: Revert some calling convention changes.
We require -mabi=ms now.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/xml2/HTMLparser.c | 4 ++--
libs/xml2/globals.c | 2 +-
libs/xml2/include/libxml/xmlerror.h | 2 +-
libs/xml2/include/libxml/xmlexports.h | 2 +-
libs/xml2/include/libxml/xmlstring.h | 2 +-
libs/xml2/libxml.h | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libs/xml2/HTMLparser.c b/libs/xml2/HTMLparser.c
index 70c6bfa18f6..b56363a3a03 100644
--- a/libs/xml2/HTMLparser.c
+++ b/libs/xml2/HTMLparser.c
@@ -1416,7 +1416,7 @@ void
htmlInitAutoClose(void) {
}
-static int __cdecl
+static int
htmlCompareTags(const void *key, const void *member) {
const xmlChar *tag = (const xmlChar *) key;
const htmlElemDesc *desc = (const htmlElemDesc *) member;
@@ -1460,7 +1460,7 @@ htmlGetEndPriority (const xmlChar *name) {
}
-static int __cdecl
+static int
htmlCompareStartClose(const void *vkey, const void *member) {
const htmlStartCloseEntry *key = (const htmlStartCloseEntry *) vkey;
const htmlStartCloseEntry *entry = (const htmlStartCloseEntry *) member;
diff --git a/libs/xml2/globals.c b/libs/xml2/globals.c
index 7fa317ee533..223393f267e 100644
--- a/libs/xml2/globals.c
+++ b/libs/xml2/globals.c
@@ -872,7 +872,7 @@ int xmlThrDefDoValidityCheckingDefaultValue(int v) {
}
#undef xmlGenericError
-xmlGenericErrorFunc * XMLCALL
+xmlGenericErrorFunc *
__xmlGenericError(void) {
if (IS_MAIN_THREAD)
return (&xmlGenericError);
diff --git a/libs/xml2/include/libxml/xmlerror.h b/libs/xml2/include/libxml/xmlerror.h
index ba5bcace03f..c1019971f24 100644
--- a/libs/xml2/include/libxml/xmlerror.h
+++ b/libs/xml2/include/libxml/xmlerror.h
@@ -914,7 +914,7 @@ XMLPUBFUN int XMLCALL
/*
* Internal callback reporting routine
*/
-XMLPUBFUN void XMLCDECL
+XMLPUBFUN void XMLCALL
__xmlRaiseError (xmlStructuredErrorFunc schannel,
xmlGenericErrorFunc channel,
void *data,
diff --git a/libs/xml2/include/libxml/xmlexports.h b/libs/xml2/include/libxml/xmlexports.h
index c81043cd26f..1fd7c5c5bf7 100644
--- a/libs/xml2/include/libxml/xmlexports.h
+++ b/libs/xml2/include/libxml/xmlexports.h
@@ -26,7 +26,7 @@
#else
#define XMLCALL __cdecl
#endif
-#define XMLCDECL WINAPIV
+#define XMLCDECL __cdecl
/** DOC_ENABLE */
#else /* not Windows */
diff --git a/libs/xml2/include/libxml/xmlstring.h b/libs/xml2/include/libxml/xmlstring.h
index 338c3845fae..2d0b2d1668e 100644
--- a/libs/xml2/include/libxml/xmlstring.h
+++ b/libs/xml2/include/libxml/xmlstring.h
@@ -94,7 +94,7 @@ XMLPUBFUN xmlChar * XMLCALL
xmlStrncatNew (const xmlChar *str1,
const xmlChar *str2,
int len);
-XMLPUBFUN int XMLCDECL
+XMLPUBFUN int XMLCALL
xmlStrPrintf (xmlChar *buf,
int len,
const char *msg,
diff --git a/libs/xml2/libxml.h b/libs/xml2/libxml.h
index fbf0374a426..da940bcc4ca 100644
--- a/libs/xml2/libxml.h
+++ b/libs/xml2/libxml.h
@@ -115,7 +115,7 @@ int __xmlRandom(void);
#endif
XMLPUBFUN xmlChar * XMLCALL xmlEscapeFormatString(xmlChar **msg);
-int XMLCALL xmlInputReadCallbackNop(void *context, char *buffer, int len);
+int xmlInputReadCallbackNop(void *context, char *buffer, int len);
#ifdef IN_LIBXML
#ifdef __GNUC__
More information about the wine-cvs
mailing list