lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-23 01:52:48 +03:00
Code Activity

include: Rename XML_EMPTY helper macro

Browse Source 
Avoid name clash with downstream projects.
This commit is contained in:
Nick Wellnhofer
2023-12-07 14:40:13 +01:00
parent a9738e311c
commit df0b540b3e
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/libxml/parser.h
View File

@@ -873,9 +873,9 @@ XMLPUBFUN const xmlSAXHandlerV1 *__xmlDefaultSAXHandler(void);
XML_OP(xmlParserDebugEntities, int, XML_DEPRECATED) \ XML_OP(xmlParserDebugEntities, int, XML_DEPRECATED) \
XML_OP(xmlPedanticParserDefaultValue, int, XML_DEPRECATED) \ XML_OP(xmlPedanticParserDefaultValue, int, XML_DEPRECATED) \
XML_OP(xmlSubstituteEntitiesDefaultValue, int, XML_DEPRECATED) \ XML_OP(xmlSubstituteEntitiesDefaultValue, int, XML_DEPRECATED) \
XML_OP(xmlIndentTreeOutput, int, XML_EMPTY) \ XML_OP(xmlIndentTreeOutput, int, XML_NO_ATTR) \
XML_OP(xmlTreeIndentString, const char *, XML_EMPTY) \ XML_OP(xmlTreeIndentString, const char *, XML_NO_ATTR) \
XML_OP(xmlSaveNoEmptyTags, int, XML_EMPTY) XML_OP(xmlSaveNoEmptyTags, int, XML_NO_ATTR)
#define XML_OP XML_DECLARE_GLOBAL #define XML_OP XML_DECLARE_GLOBAL
XML_GLOBALS_PARSER XML_GLOBALS_PARSER

8
include/libxml/xmlerror.h
View File

@@ -861,10 +861,10 @@ typedef void (*xmlStructuredErrorFunc) (void *userData, const xmlError *error);
/** DOC_DISABLE */ /** DOC_DISABLE */
#define XML_GLOBALS_ERROR \ #define XML_GLOBALS_ERROR \
XML_OP(xmlLastError, xmlError, XML_DEPRECATED) \ XML_OP(xmlLastError, xmlError, XML_DEPRECATED) \
XML_OP(xmlGenericError, xmlGenericErrorFunc, XML_EMPTY) \ XML_OP(xmlGenericError, xmlGenericErrorFunc, XML_NO_ATTR) \
XML_OP(xmlGenericErrorContext, void *, XML_EMPTY) \ XML_OP(xmlGenericErrorContext, void *, XML_NO_ATTR) \
XML_OP(xmlStructuredError, xmlStructuredErrorFunc, XML_EMPTY) \ XML_OP(xmlStructuredError, xmlStructuredErrorFunc, XML_NO_ATTR) \
XML_OP(xmlStructuredErrorContext, void *, XML_EMPTY) XML_OP(xmlStructuredErrorContext, void *, XML_NO_ATTR)
#define XML_OP XML_DECLARE_GLOBAL #define XML_OP XML_DECLARE_GLOBAL
XML_GLOBALS_ERROR XML_GLOBALS_ERROR

10
include/libxml/xmlmemory.h
View File

@@ -72,11 +72,11 @@ typedef char *(*xmlStrdupFunc)(const char *str);
/** DOC_DISABLE */ /** DOC_DISABLE */
#ifdef LIBXML_THREAD_ALLOC_ENABLED #ifdef LIBXML_THREAD_ALLOC_ENABLED
#define XML_GLOBALS_ALLOC \ #define XML_GLOBALS_ALLOC \
XML_OP(xmlMalloc, xmlMallocFunc, XML_EMPTY) \ XML_OP(xmlMalloc, xmlMallocFunc, XML_NO_ATTR) \
XML_OP(xmlMallocAtomic, xmlMallocFunc, XML_EMPTY) \ XML_OP(xmlMallocAtomic, xmlMallocFunc, XML_NO_ATTR) \
XML_OP(xmlRealloc, xmlReallocFunc, XML_EMPTY) \ XML_OP(xmlRealloc, xmlReallocFunc, XML_NO_ATTR) \
XML_OP(xmlFree, xmlFreeFunc, XML_EMPTY) \ XML_OP(xmlFree, xmlFreeFunc, XML_NO_ATTR) \
XML_OP(xmlMemStrdup, xmlStrdupFunc, XML_EMPTY) XML_OP(xmlMemStrdup, xmlStrdupFunc, XML_NO_ATTR)
#define XML_OP XML_DECLARE_GLOBAL #define XML_OP XML_DECLARE_GLOBAL
XML_GLOBALS_ALLOC XML_GLOBALS_ALLOC
#undef XML_OP #undef XML_OP

2
include/libxml/xmlversion.h.in
View File

@@ -471,7 +471,7 @@ XMLPUBFUN void xmlCheckVersion(int version);
#endif #endif
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#define XML_EMPTY #define XML_NO_ATTR
#ifdef LIBXML_THREAD_ENABLED #ifdef LIBXML_THREAD_ENABLED
#define XML_DECLARE_GLOBAL(name, type, attrs) \ #define XML_DECLARE_GLOBAL(name, type, attrs) \