shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-12-23 17:33:50 +03:00
Code

fix bug #63752 of compiling libxml with a non standard set of options

Browse Source 
* encoding.c global.data globals.c testThreads.c: fix bug #63752
  of compiling libxml with a non standard set of options
Daniel
This commit is contained in:
Daniel Veillard 2001-11-04 20:19:12 +00:00
parent 027edfb741
commit a4617b8aba
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Nov 4 21:17:24 CET 2001 Daniel Veillard <daniel@veillard.com>
* encoding.c global.data globals.c testThreads.c: fix bug #63752
of compiling libxml with a non standard set of options
Sun Nov 4 13:11:41 MST 2001 John Fleck <jfleck@inkstain.net
* doc/xmllint.xml, xmllint.1 - updating xmllint man page to

2
encoding.c
View File

@ -43,8 +43,8 @@
#ifdef LIBXML_HTML_ENABLED
#include <libxml/HTMLparser.h>
#endif
#include <libxml/xmlerror.h>
#include <libxml/globals.h>
#include <libxml/xmlerror.h>
static xmlCharEncodingHandlerPtr xmlUTF16LEHandler = NULL;
static xmlCharEncodingHandlerPtr xmlUTF16BEHandler = NULL;

2
global.data
View File

@ -1,5 +1,3 @@
xmlSAXHandler,docbDefaultSAXHandler
xmlSAXHandler,htmlDefaultSAXHandler
int,oldXMLWDcompatibility
xmlBufferAllocationScheme,xmlBufferAllocScheme
int,xmlDefaultBufferSize

22
globals.c
View File

@ -262,8 +262,12 @@ xmlInitializeGlobalState(xmlGlobalStatePtr gs)
* Perform initialisation as required by libxml
*/
initxmlDefaultSAXHandler(&gs->xmlDefaultSAXHandler, 1);
#ifdef LIBXML_DOCB_ENABLED
initdocbDefaultSAXHandler(&gs->docbDefaultSAXHandler);
#endif
#ifdef LIBXML_HTML_ENABLED
inithtmlDefaultSAXHandler(&gs->htmlDefaultSAXHandler);
#endif
initGenericErrorDefaultFunc(&gs->xmlGenericError);
gs->oldXMLWDcompatibility = 0;
@ -299,13 +303,7 @@ xmlInitializeGlobalState(xmlGlobalStatePtr gs)
gs->xmlSubstituteEntitiesDefaultValue = 0;
}
/*
* Everything starting from the line below is
* Automatically generated by build_glob.py.
* Do not modify the previous line.
*/
#ifdef LIBXML_DOCB_ENABLED
extern xmlSAXHandler docbDefaultSAXHandler;
#undef docbDefaultSAXHandler
xmlSAXHandler *
@ -315,7 +313,9 @@ __docbDefaultSAXHandler(void) {
else
return (&xmlGetGlobalState()->docbDefaultSAXHandler);
}
#endif
#ifdef LIBXML_HTML_ENABLED
extern xmlSAXHandler htmlDefaultSAXHandler;
#undef htmlDefaultSAXHandler
xmlSAXHandler *
@ -325,6 +325,14 @@ __htmlDefaultSAXHandler(void) {
else
return (&xmlGetGlobalState()->htmlDefaultSAXHandler);
}
#endif
/*
* Everything starting from the line below is
* Automatically generated by build_glob.py.
* Do not modify the previous line.
*/
extern int oldXMLWDcompatibility;
#undef oldXMLWDcompatibility

4
testThreads.c
View File

@ -2,7 +2,7 @@
#include <stdio.h>
#include <libxml/xmlversion.h>
#ifdef LIBXML_THREAD_ENABLED
#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED)
#include <libxml/globals.h>
#include <libxml/threads.h>
#include <libxml/parser.h>
@ -128,7 +128,7 @@ main()
int
main()
{
fprintf(stderr, "libxml was not compiled with thread support\n");
fprintf(stderr, "libxml was not compiled with thread or catalog support\n");
return (0);
}
#endif