Commit 1d8c9b29 authored by William M. Brack's avatar William M. Brack
Browse files

fixed to skip (if necessary) the BOM for encoding 'utf-16'. Completes the

* parserInternals.c: fixed to skip (if necessary) the BOM for
  encoding 'utf-16'.  Completes the fix for bug #152286.
* tree.c, parser.c: minor warning cleanup, no change to logic
parent ff349110
Sat Dec 25 18:10:02 HKT 2004 William Brack <wbrack@mmm.com.hk>
* parserInternals.c: fixed to skip (if necessary) the BOM for
encoding 'utf-16'. Completes the fix for bug #152286.
* tree.c, parser.c: minor warning cleanup, no change to logic
Fri Dec 24 16:31:22 HKT 2004 William Brack <wbrack@mmm.com.hk> Fri Dec 24 16:31:22 HKT 2004 William Brack <wbrack@mmm.com.hk>
* python/generator.py: added most required entires to * python/generator.py: added most required entires to
......
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* Define to 1 if the C compiler supports function prototypes. */ /* Define if compiler has function prototypes */
#undef PROTOTYPES #undef PROTOTYPES
/* Determine what socket length (socklen_t) data type is */ /* Determine what socket length (socklen_t) data type is */
...@@ -276,9 +276,6 @@ ...@@ -276,9 +276,6 @@
/* Using the Win32 Socket implementation */ /* Using the Win32 Socket implementation */
#undef _WINSOCKAPI_ #undef _WINSOCKAPI_
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
/* Win32 Std C name mangling work-around */ /* Win32 Std C name mangling work-around */
#undef snprintf #undef snprintf
......
...@@ -57,7 +57,10 @@ ...@@ -57,7 +57,10 @@
#ifdef LIBXML_CATALOG_ENABLED #ifdef LIBXML_CATALOG_ENABLED
#include <libxml/catalog.h> #include <libxml/catalog.h>
#endif #endif
#ifdef LIBXML_SCHEMAS_ENABLED
#include <libxml/xmlschemastypes.h>
#include <libxml/relaxng.h>
#endif
#ifdef HAVE_CTYPE_H #ifdef HAVE_CTYPE_H
#include <ctype.h> #include <ctype.h>
#endif #endif
......
...@@ -1145,7 +1145,8 @@ xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, ...@@ -1145,7 +1145,8 @@ xmlSwitchInputEncoding(xmlParserCtxtPtr ctxt, xmlParserInputPtr input,
* UTF-16 * UTF-16
*/ */
if ((handler->name != NULL) && if ((handler->name != NULL) &&
(!strcmp(handler->name, "UTF-16LE")) && (!strcmp(handler->name, "UTF-16LE") ||
!strcmp(handler->name, "UTF-16")) &&
(input->cur[0] == 0xFF) && (input->cur[1] == 0xFE)) { (input->cur[0] == 0xFF) && (input->cur[1] == 0xFE)) {
input->cur += 2; input->cur += 2;
} }
......
...@@ -37,6 +37,9 @@ ...@@ -37,6 +37,9 @@
#ifdef LIBXML_HTML_ENABLED #ifdef LIBXML_HTML_ENABLED
#include <libxml/HTMLtree.h> #include <libxml/HTMLtree.h>
#endif #endif
#ifdef LIBXML_DEBUG_ENABLED
#include <libxml/debugXML.h>
#endif
int __xmlRegisterCallbacks = 0; int __xmlRegisterCallbacks = 0;
......
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