diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2003-09-25 14:29:29 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2003-09-25 14:29:29 +0000 |
| commit | 092643b52d29e6b721c257c4c88efa8259eebfe9 (patch) | |
| tree | f7161c5825d308c54b833fc2c86e3957882283b6 /include/libxml/globals.h | |
| parent | 7a02cfe0d7c5bd03dd51a945561b9c6e1df614e9 (diff) | |
| download | android_external_libxml2-092643b52d29e6b721c257c4c88efa8259eebfe9.tar.gz android_external_libxml2-092643b52d29e6b721c257c4c88efa8259eebfe9.tar.bz2 android_external_libxml2-092643b52d29e6b721c257c4c88efa8259eebfe9.zip | |
preparing a beta3 solving the ABI problems make sure the global variables
* configure.in: preparing a beta3 solving the ABI problems
* globals.c parser.c parserInternals.c testHTML.c HTMLparser.c SAX.c
include/libxml/globals.h include/libxml/SAX.h: make sure the
global variables for the default SAX handler are V1 ones to
avoid ABI compat problems.
* xmlreader.c: cleanup of uneeded code
* hash.c: fix a comment
Daniel
Diffstat (limited to 'include/libxml/globals.h')
| -rw-r--r-- | include/libxml/globals.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/libxml/globals.h b/include/libxml/globals.h index 9fe77c88..6004269a 100644 --- a/include/libxml/globals.h +++ b/include/libxml/globals.h @@ -16,6 +16,7 @@ #include <libxml/xmlversion.h> #include <libxml/parser.h> #include <libxml/xmlerror.h> +#include <libxml/SAX.h> #include <libxml/SAX2.h> #include <libxml/xmlmemory.h> @@ -70,9 +71,9 @@ struct _xmlGlobalState const char *xmlParserVersion; xmlSAXLocator xmlDefaultSAXLocator; - xmlSAXHandler xmlDefaultSAXHandler; - xmlSAXHandler docbDefaultSAXHandler; - xmlSAXHandler htmlDefaultSAXHandler; + xmlSAXHandlerV1 xmlDefaultSAXHandler; + xmlSAXHandlerV1 docbDefaultSAXHandler; + xmlSAXHandlerV1 htmlDefaultSAXHandler; xmlFreeFunc xmlFree; xmlMallocFunc xmlMalloc; @@ -183,22 +184,22 @@ XMLPUBVAR xmlStrdupFunc xmlMemStrdup; #endif /* LIBXML_THREAD_ALLOC_ENABLED */ #ifdef LIBXML_DOCB_ENABLED -XMLPUBFUN xmlSAXHandler * XMLCALL __docbDefaultSAXHandler(void); +XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __docbDefaultSAXHandler(void); #ifdef LIBXML_THREAD_ENABLED #define docbDefaultSAXHandler \ (*(__docbDefaultSAXHandler())) #else -XMLPUBVAR xmlSAXHandler docbDefaultSAXHandler; +XMLPUBVAR xmlSAXHandlerV1 docbDefaultSAXHandler; #endif #endif #ifdef LIBXML_HTML_ENABLED -XMLPUBFUN xmlSAXHandler * XMLCALL __htmlDefaultSAXHandler(void); +XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __htmlDefaultSAXHandler(void); #ifdef LIBXML_THREAD_ENABLED #define htmlDefaultSAXHandler \ (*(__htmlDefaultSAXHandler())) #else -XMLPUBVAR xmlSAXHandler htmlDefaultSAXHandler; +XMLPUBVAR xmlSAXHandlerV1 htmlDefaultSAXHandler; #endif #endif @@ -236,12 +237,12 @@ XMLPUBVAR int xmlDefaultBufferSize; #endif XMLPUBFUN int XMLCALL xmlThrDefDefaultBufferSize(int v); -XMLPUBFUN xmlSAXHandler * XMLCALL __xmlDefaultSAXHandler(void); +XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __xmlDefaultSAXHandler(void); #ifdef LIBXML_THREAD_ENABLED #define xmlDefaultSAXHandler \ (*(__xmlDefaultSAXHandler())) #else -XMLPUBVAR xmlSAXHandler xmlDefaultSAXHandler; +XMLPUBVAR xmlSAXHandlerV1 xmlDefaultSAXHandler; #endif XMLPUBFUN xmlSAXLocator * XMLCALL __xmlDefaultSAXLocator(void); |