1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00

include: Remove unnecessary includes

- Don't include tree.h from encoding.h
- Don't include parser.h from xmlIO.h
This commit is contained in:
Nick Wellnhofer
2023-09-20 17:38:26 +02:00
parent eb985d6f8e
commit 7909ff08e2
3 changed files with 9 additions and 24 deletions

View File

@@ -34,6 +34,7 @@
#include <libxml/encoding.h> #include <libxml/encoding.h>
#include <libxml/xmlmemory.h> #include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#ifdef LIBXML_HTML_ENABLED #ifdef LIBXML_HTML_ENABLED
#include <libxml/HTMLparser.h> #include <libxml/HTMLparser.h>
#endif #endif

View File

@@ -151,14 +151,6 @@ struct _xmlCharEncodingHandler {
#endif /* LIBXML_ICU_ENABLED */ #endif /* LIBXML_ICU_ENABLED */
}; };
#ifdef __cplusplus
}
#endif
#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
#endif
/* /*
* Interfaces for encoding handlers. * Interfaces for encoding handlers.
*/ */
@@ -203,20 +195,21 @@ XMLPUBFUN xmlCharEncoding
xmlDetectCharEncoding (const unsigned char *in, xmlDetectCharEncoding (const unsigned char *in,
int len); int len);
struct _xmlBuffer;
XMLPUBFUN int XMLPUBFUN int
xmlCharEncOutFunc (xmlCharEncodingHandler *handler, xmlCharEncOutFunc (xmlCharEncodingHandler *handler,
xmlBufferPtr out, struct _xmlBuffer *out,
xmlBufferPtr in); struct _xmlBuffer *in);
XMLPUBFUN int XMLPUBFUN int
xmlCharEncInFunc (xmlCharEncodingHandler *handler, xmlCharEncInFunc (xmlCharEncodingHandler *handler,
xmlBufferPtr out, struct _xmlBuffer *out,
xmlBufferPtr in); struct _xmlBuffer *in);
XML_DEPRECATED XML_DEPRECATED
XMLPUBFUN int XMLPUBFUN int
xmlCharEncFirstLine (xmlCharEncodingHandler *handler, xmlCharEncFirstLine (xmlCharEncodingHandler *handler,
xmlBufferPtr out, struct _xmlBuffer *out,
xmlBufferPtr in); struct _xmlBuffer *in);
XMLPUBFUN int XMLPUBFUN int
xmlCharEncCloseFunc (xmlCharEncodingHandler *handler); xmlCharEncCloseFunc (xmlCharEncodingHandler *handler);

View File

@@ -13,6 +13,7 @@
#include <stdio.h> #include <stdio.h>
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#include <libxml/encoding.h> #include <libxml/encoding.h>
#include <libxml/tree.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -140,16 +141,6 @@ typedef xmlOutputBufferPtr
(*xmlOutputBufferCreateFilenameFunc)(const char *URI, (*xmlOutputBufferCreateFilenameFunc)(const char *URI,
xmlCharEncodingHandlerPtr encoder, int compression); xmlCharEncodingHandlerPtr encoder, int compression);
#ifdef __cplusplus
}
#endif
#include <libxml/tree.h>
#include <libxml/parser.h>
#ifdef __cplusplus
extern "C" {
#endif
struct _xmlParserInputBuffer { struct _xmlParserInputBuffer {
void* context; void* context;
xmlInputReadCallback readcallback; xmlInputReadCallback readcallback;