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 /HTMLparser.c | |
| parent | 7a02cfe0d7c5bd03dd51a945561b9c6e1df614e9 (diff) | |
| download | libxml2-092643b52d29e6b721c257c4c88efa8259eebfe9.tar.gz | |
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 'HTMLparser.c')
| -rw-r--r-- | HTMLparser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/HTMLparser.c b/HTMLparser.c index 90e2460e..d2cba584 100644 --- a/HTMLparser.c +++ b/HTMLparser.c @@ -4102,10 +4102,10 @@ htmlInitParserCtxt(htmlParserCtxtPtr ctxt) ctxt->nameMax = 10; ctxt->name = NULL; - if (sax == NULL) ctxt->sax = &htmlDefaultSAXHandler; + if (sax == NULL) ctxt->sax = (xmlSAXHandlerPtr) &htmlDefaultSAXHandler; else { ctxt->sax = sax; - memcpy(sax, &htmlDefaultSAXHandler, sizeof(htmlSAXHandler)); + memcpy(sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1)); } ctxt->userData = ctxt; ctxt->myDoc = NULL; @@ -5175,7 +5175,7 @@ htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax, void *user_data, if(enc==XML_CHAR_ENCODING_UTF8 || buf->encoder) ctxt->charset=XML_CHAR_ENCODING_UTF8; if (sax != NULL) { - if (ctxt->sax != &htmlDefaultSAXHandler) + if (ctxt->sax != (xmlSAXHandlerPtr) &htmlDefaultSAXHandler) xmlFree(ctxt->sax); ctxt->sax = (htmlSAXHandlerPtr) xmlMalloc(sizeof(htmlSAXHandler)); if (ctxt->sax == NULL) { |