system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 23:14:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xml2: Revert some calling convention changes.

Browse source 
We require -mabi=ms now.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2022-03-07 20:41:50 +01:00
parent 91d13963f8
commit 5eb5d81793
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/xml2/HTMLparser.c
View file

@ -1416,7 +1416,7 @@ void
htmlInitAutoClose(void) { htmlInitAutoClose(void) {
} }
static int __cdecl static int
htmlCompareTags(const void *key, const void *member) { htmlCompareTags(const void *key, const void *member) {
const xmlChar *tag = (const xmlChar *) key; const xmlChar *tag = (const xmlChar *) key;
const htmlElemDesc *desc = (const htmlElemDesc *) member; 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) { htmlCompareStartClose(const void *vkey, const void *member) {
const htmlStartCloseEntry *key = (const htmlStartCloseEntry *) vkey; const htmlStartCloseEntry *key = (const htmlStartCloseEntry *) vkey;
const htmlStartCloseEntry *entry = (const htmlStartCloseEntry *) member; const htmlStartCloseEntry *entry = (const htmlStartCloseEntry *) member;

2
libs/xml2/globals.c
View file

@ -872,7 +872,7 @@ int xmlThrDefDoValidityCheckingDefaultValue(int v) {
} }
#undef xmlGenericError #undef xmlGenericError
xmlGenericErrorFunc * XMLCALL xmlGenericErrorFunc *
__xmlGenericError(void) { __xmlGenericError(void) {
if (IS_MAIN_THREAD) if (IS_MAIN_THREAD)
return (&xmlGenericError); return (&xmlGenericError);

2
libs/xml2/include/libxml/xmlerror.h
View file

@ -914,7 +914,7 @@ XMLPUBFUN int XMLCALL
/* /*
* Internal callback reporting routine * Internal callback reporting routine
*/ */
XMLPUBFUN void XMLCDECL XMLPUBFUN void XMLCALL
__xmlRaiseError (xmlStructuredErrorFunc schannel, __xmlRaiseError (xmlStructuredErrorFunc schannel,
xmlGenericErrorFunc channel, xmlGenericErrorFunc channel,
void *data, void *data,

2
libs/xml2/include/libxml/xmlexports.h
View file

@ -26,7 +26,7 @@
#else #else
#define XMLCALL __cdecl #define XMLCALL __cdecl
#endif #endif
#define XMLCDECL WINAPIV #define XMLCDECL __cdecl
/** DOC_ENABLE */ /** DOC_ENABLE */
#else /* not Windows */ #else /* not Windows */

2
libs/xml2/include/libxml/xmlstring.h
View file

@ -94,7 +94,7 @@ XMLPUBFUN xmlChar * XMLCALL
xmlStrncatNew (const xmlChar *str1, xmlStrncatNew (const xmlChar *str1,
const xmlChar *str2, const xmlChar *str2,
int len); int len);
XMLPUBFUN int XMLCDECL XMLPUBFUN int XMLCALL
xmlStrPrintf (xmlChar *buf, xmlStrPrintf (xmlChar *buf,
int len, int len,
const char *msg, const char *msg,

2
libs/xml2/libxml.h
View file

@ -115,7 +115,7 @@ int __xmlRandom(void);
#endif #endif
XMLPUBFUN xmlChar * XMLCALL xmlEscapeFormatString(xmlChar **msg); 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 IN_LIBXML
#ifdef __GNUC__ #ifdef __GNUC__