Commit 6c4ffafd authored by Daniel Veillard's avatar Daniel Veillard
Browse files

trying to fix the include mess Daniel

* include/libxml/encoding.h include/libxml/entities.h
  include/libxml/globals.h include/libxml/parser.h
  include/libxml/threads.h include/libxml/tree.h
  include/libxml/xmlmemory.h: trying to fix the include mess
Daniel
parent 1a612ed3
Mon Feb 11 09:53:02 CET 2002 Daniel Veillard <daniel@veillard.com>
* include/libxml/encoding.h include/libxml/entities.h
include/libxml/globals.h include/libxml/parser.h
include/libxml/threads.h include/libxml/tree.h
include/libxml/xmlmemory.h: trying to fix the include mess
Mon Feb 11 08:53:33 CET 2002 Daniel Veillard <daniel@veillard.com>
* include/libxml/xmlmemory.h: reverted part of the previous
......
......@@ -29,8 +29,6 @@
#ifdef LIBXML_ICONV_ENABLED
#include <iconv.h>
#endif
#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
#endif
......@@ -139,6 +137,14 @@ struct _xmlCharEncodingHandler {
#endif /* LIBXML_ICONV_ENABLED */
};
#ifdef __cplusplus
}
#endif
#include <libxml/tree.h>
#ifdef __cplusplus
extern "C" {
#endif
/*
* Interfaces for encoding handlers
*/
......
......@@ -32,8 +32,6 @@ typedef enum {
* and the linkind data needed for the linking in the hash table.
*/
typedef struct _xmlEntity xmlEntity;
typedef xmlEntity *xmlEntityPtr;
struct _xmlEntity {
void *_private; /* application data */
xmlElementType type; /* XML_ENTITY_DECL, must be second ! */
......
......@@ -16,6 +16,7 @@
#include <libxml/parser.h>
#include <libxml/xmlerror.h>
#include <libxml/SAX.h>
#include <libxml/xmlmemory.h>
#ifdef __cplusplus
extern "C" {
......@@ -88,6 +89,14 @@ struct _xmlGlobalState
int xmlIndentTreeOutput;
};
#ifdef __cplusplus
}
#endif
#include <libxml/threads.h>
#ifdef __cplusplus
extern "C" {
#endif
void xmlInitializeGlobalState(xmlGlobalStatePtr gs);
/*
......
......@@ -12,8 +12,6 @@
#include <libxml/tree.h>
#include <libxml/valid.h>
#include <libxml/entities.h>
#include <libxml/encoding.h>
#include <libxml/xmlIO.h>
#ifdef __cplusplus
extern "C" {
......@@ -227,8 +225,6 @@ struct _xmlParserCtxt {
*
* a SAX Locator.
*/
typedef struct _xmlSAXLocator xmlSAXLocator;
typedef xmlSAXLocator *xmlSAXLocatorPtr;
struct _xmlSAXLocator {
const xmlChar *(*getPublicId)(void *ctx);
const xmlChar *(*getSystemId)(void *ctx);
......@@ -566,8 +562,6 @@ typedef int (*hasInternalSubsetSAXFunc) (void *ctx);
*/
typedef int (*hasExternalSubsetSAXFunc) (void *ctx);
typedef struct _xmlSAXHandler xmlSAXHandler;
typedef xmlSAXHandler *xmlSAXHandlerPtr;
struct _xmlSAXHandler {
internalSubsetSAXFunc internalSubset;
isStandaloneSAXFunc isStandalone;
......@@ -646,6 +640,16 @@ LIBXML_DLL_IMPORT extern int xmlSubstituteEntitiesDefaultValue;
LIBXML_DLL_IMPORT extern int xmlGetWarningsDefaultValue;
#endif
#ifdef __cplusplus
}
#endif
#include <libxml/encoding.h>
#include <libxml/xmlIO.h>
#include <libxml/globals.h>
#ifdef __cplusplus
extern "C" {
#endif
/*
* Init/Cleanup
......@@ -854,8 +858,5 @@ xmlParserInputPtr
#ifdef __cplusplus
}
#endif
#include <libxml/globals.h>
#endif /* __XML_PARSER_H__ */
......@@ -9,8 +9,6 @@
#ifndef __XML_THREADS_H__
#define __XML_THREADS_H__
#include <libxml/globals.h>
#ifdef __cplusplus
extern "C" {
#endif
......@@ -21,17 +19,25 @@ extern "C" {
typedef struct _xmlMutex xmlMutex;
typedef xmlMutex *xmlMutexPtr;
xmlMutexPtr xmlNewMutex (void);
void xmlMutexLock (xmlMutexPtr tok);
void xmlMutexUnlock (xmlMutexPtr tok);
void xmlFreeMutex (xmlMutexPtr tok);
/*
* xmlRMutex are reentrant mutual exception locks
*/
typedef struct _xmlRMutex xmlRMutex;
typedef xmlRMutex *xmlRMutexPtr;
#ifdef __cplusplus
}
#endif
#include <libxml/globals.h>
#ifdef __cplusplus
extern "C" {
#endif
xmlMutexPtr xmlNewMutex (void);
void xmlMutexLock (xmlMutexPtr tok);
void xmlMutexUnlock (xmlMutexPtr tok);
void xmlFreeMutex (xmlMutexPtr tok);
xmlRMutexPtr xmlNewRMutex (void);
void xmlRMutexLock (xmlRMutexPtr tok);
void xmlRMutexUnlock (xmlRMutexPtr tok);
......
......@@ -19,8 +19,6 @@
#else
#include <libxml/xmlversion.h>
#endif
#include <libxml/xmlmemory.h>
#ifdef __cplusplus
extern "C" {
#endif
......@@ -42,6 +40,16 @@ typedef xmlParserInput *xmlParserInputPtr;
typedef struct _xmlParserCtxt xmlParserCtxt;
typedef xmlParserCtxt *xmlParserCtxtPtr;
typedef struct _xmlSAXLocator xmlSAXLocator;
typedef xmlSAXLocator *xmlSAXLocatorPtr;
typedef struct _xmlSAXHandler xmlSAXHandler;
typedef xmlSAXHandler *xmlSAXHandlerPtr;
/* entities.h */
typedef struct _xmlEntity xmlEntity;
typedef xmlEntity *xmlEntityPtr;
/**
* BASE_BUFFER_SIZE:
*
......@@ -859,6 +867,9 @@ void xmlSetCompressMode (int mode);
#ifdef __cplusplus
}
#endif
#ifndef __XML_PARSER_H__
#include <libxml/xmlmemory.h>
#endif
#endif /* __XML_TREE_H__ */
......@@ -88,11 +88,11 @@ typedef char *(*xmlStrdupFunc)(const char *str);
/*
* The 4 interfaces used for all memory handling within libxml
*/
LIBXML_DLL_IMPORT extern xmlFreeFunc xmlFree;
LIBXML_DLL_IMPORT extern xmlMallocFunc xmlMalloc;
LIBXML_DLL_IMPORT extern xmlReallocFunc xmlRealloc;
LIBXML_DLL_IMPORT extern xmlStrdupFunc xmlMemStrdup;
*/
/*
* The way to overload the existing functions
......@@ -158,5 +158,12 @@ char * xmlMemStrdupLoc(const char *str, const char *file, int line);
}
#endif /* __cplusplus */
#ifndef __XML_GLOBALS_H
#ifndef __XML_THREADS_H__
#include <libxml/threads.h>
#include <libxml/globals.h>
#endif
#endif
#endif /* _DEBUG_MEMORY_ALLOC_ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment