1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-26 00:37:43 +03:00

include: Break inclusion cycle between tree.h and xmlregexp.h

This commit is contained in:
Nick Wellnhofer
2023-09-20 19:09:15 +02:00
parent 699299cae3
commit 736327df6b
2 changed files with 3 additions and 20 deletions

View File

@@ -16,6 +16,8 @@
#include <limits.h> #include <limits.h>
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#include <libxml/xmlstring.h> #include <libxml/xmlstring.h>
#include <libxml/xmlmemory.h>
#include <libxml/xmlregexp.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@@ -329,14 +331,6 @@ typedef enum {
XML_ELEMENT_TYPE_ELEMENT XML_ELEMENT_TYPE_ELEMENT
} xmlElementTypeVal; } xmlElementTypeVal;
#ifdef __cplusplus
}
#endif
#include <libxml/xmlregexp.h>
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* xmlElement: * xmlElement:
* *
@@ -1341,9 +1335,6 @@ XMLPUBFUN xmlDeregisterNodeFunc
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#ifndef __XML_PARSER_H__
#include <libxml/xmlmemory.h>
#endif
#endif /* __XML_TREE_H__ */ #endif /* __XML_TREE_H__ */

View File

@@ -12,6 +12,7 @@
#define __XML_REGEXP_H__ #define __XML_REGEXP_H__
#include <libxml/xmlversion.h> #include <libxml/xmlversion.h>
#include <libxml/dict.h>
#ifdef LIBXML_REGEXP_ENABLED #ifdef LIBXML_REGEXP_ENABLED
@@ -36,15 +37,6 @@ typedef xmlRegexp *xmlRegexpPtr;
typedef struct _xmlRegExecCtxt xmlRegExecCtxt; typedef struct _xmlRegExecCtxt xmlRegExecCtxt;
typedef xmlRegExecCtxt *xmlRegExecCtxtPtr; typedef xmlRegExecCtxt *xmlRegExecCtxtPtr;
#ifdef __cplusplus
}
#endif
#include <libxml/tree.h>
#include <libxml/dict.h>
#ifdef __cplusplus
extern "C" {
#endif
/* /*
* The POSIX like API * The POSIX like API
*/ */