shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-21 22:50:08 +03:00
Code

include: Move globals from xmlsave.h to parser.h

Browse Source 
Fix downstream build issues after reworking globals.h.
This commit is contained in:
Nick Wellnhofer 2023-12-06 19:56:50 +01:00
parent c011e7605d
commit 9122ad0ce6
4 changed files with 7 additions and 27 deletions

1
doc/apibuild.py

@ -65,7 +65,6 @@ ignored_words = {
"XML_GLOBALS_ERROR": (0, "macro keyword"),
"XML_GLOBALS_IO": (0, "macro keyword"),
"XML_GLOBALS_PARSER": (0, "macro keyword"),
"XML_GLOBALS_SAVE": (0, "macro keyword"),
"XML_GLOBALS_TREE": (0, "macro keyword"),
"XML_THREAD_LOCAL": (0, "macro keyword"),
}

2
globals.c

@ -80,7 +80,6 @@ XML_GLOBALS_ALLOC
XML_GLOBALS_ERROR
XML_GLOBALS_IO
XML_GLOBALS_PARSER
XML_GLOBALS_SAVE
XML_GLOBALS_TREE
#undef XML_OP
};
@ -893,7 +892,6 @@ XML_GLOBALS_ALLOC
XML_GLOBALS_ERROR
XML_GLOBALS_IO
XML_GLOBALS_PARSER
XML_GLOBALS_SAVE
XML_GLOBALS_TREE
#undef XML_OP

8
include/libxml/parser.h

@ -872,7 +872,10 @@ XMLPUBFUN const xmlSAXHandlerV1 *__xmlDefaultSAXHandler(void);
XML_OP(xmlLoadExtDtdDefaultValue, int, XML_DEPRECATED) \
XML_OP(xmlParserDebugEntities, 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(xmlTreeIndentString, const char *, XML_EMPTY) \
XML_OP(xmlSaveNoEmptyTags, int, XML_EMPTY)
#define XML_OP XML_DECLARE_GLOBAL
XML_GLOBALS_PARSER
@ -895,6 +898,9 @@ XML_GLOBALS_PARSER
XML_GLOBAL_MACRO(xmlPedanticParserDefaultValue)
#define xmlSubstituteEntitiesDefaultValue \
XML_GLOBAL_MACRO(xmlSubstituteEntitiesDefaultValue)
#define xmlIndentTreeOutput XML_GLOBAL_MACRO(xmlIndentTreeOutput)
#define xmlTreeIndentString XML_GLOBAL_MACRO(xmlTreeIndentString)
#define xmlSaveNoEmptyTags XML_GLOBAL_MACRO(xmlSaveNoEmptyTags)
#endif
/** DOC_ENABLE */

23
include/libxml/xmlsave.h

@ -41,23 +41,6 @@ typedef enum {
typedef struct _xmlSaveCtxt xmlSaveCtxt;
typedef xmlSaveCtxt *xmlSaveCtxtPtr;
/** DOC_DISABLE */
#define XML_GLOBALS_SAVE \
XML_OP(xmlIndentTreeOutput, int, XML_EMPTY) \
XML_OP(xmlTreeIndentString, const char *, XML_EMPTY) \
XML_OP(xmlSaveNoEmptyTags, int, XML_EMPTY)
#define XML_OP XML_DECLARE_GLOBAL
XML_GLOBALS_SAVE
#undef XML_OP
#if defined(LIBXML_THREAD_ENABLED) && !defined(XML_GLOBALS_NO_REDEFINITION)
#define xmlIndentTreeOutput XML_GLOBAL_MACRO(xmlIndentTreeOutput)
#define xmlTreeIndentString XML_GLOBAL_MACRO(xmlTreeIndentString)
#define xmlSaveNoEmptyTags XML_GLOBAL_MACRO(xmlSaveNoEmptyTags)
#endif
/** DOC_ENABLE */
XMLPUBFUN xmlSaveCtxtPtr
xmlSaveToFd (int fd,
const char *encoding,
@ -108,12 +91,6 @@ XMLPUBFUN int
}
#endif
#else /* LIBXML_OUTPUT_ENABLED */
/** DOC_DISABLE */
#define XML_GLOBALS_SAVE
/** DOC_ENABLE */
#endif /* LIBXML_OUTPUT_ENABLED */
#endif /* __XML_XMLSAVE_H__ */