| Index: third_party/libxml/src/include/libxml/encoding.h
|
| diff --git a/third_party/libxml/src/include/libxml/encoding.h b/third_party/libxml/src/include/libxml/encoding.h
|
| index b5f8b48447223af049e57ca315414f3a09831f96..7967cc66a965f9381e2c569d153943fb2b7593c8 100644
|
| --- a/third_party/libxml/src/include/libxml/encoding.h
|
| +++ b/third_party/libxml/src/include/libxml/encoding.h
|
| @@ -26,24 +26,9 @@
|
|
|
| #ifdef LIBXML_ICONV_ENABLED
|
| #include <iconv.h>
|
| -#else
|
| +#endif
|
| #ifdef LIBXML_ICU_ENABLED
|
| #include <unicode/ucnv.h>
|
| -#if 0
|
| -/* Forward-declare UConverter here rather than pulling in <unicode/ucnv.h>
|
| - * to prevent unwanted ICU symbols being exposed to users of libxml2.
|
| - * One particular case is Qt4 conflicting on UChar32.
|
| - */
|
| -#include <stdint.h>
|
| -struct UConverter;
|
| -typedef struct UConverter UConverter;
|
| -#ifdef _MSC_VER
|
| -typedef wchar_t UChar;
|
| -#else
|
| -typedef uint16_t UChar;
|
| -#endif
|
| -#endif
|
| -#endif
|
| #endif
|
| #ifdef __cplusplus
|
| extern "C" {
|
| @@ -178,32 +163,32 @@ extern "C" {
|
| /*
|
| * Interfaces for encoding handlers.
|
| */
|
| -XMLPUBFUN void XMLCALL
|
| +XMLPUBFUN void XMLCALL
|
| xmlInitCharEncodingHandlers (void);
|
| -XMLPUBFUN void XMLCALL
|
| +XMLPUBFUN void XMLCALL
|
| xmlCleanupCharEncodingHandlers (void);
|
| -XMLPUBFUN void XMLCALL
|
| +XMLPUBFUN void XMLCALL
|
| xmlRegisterCharEncodingHandler (xmlCharEncodingHandlerPtr handler);
|
| XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
|
| xmlGetCharEncodingHandler (xmlCharEncoding enc);
|
| XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
|
| xmlFindCharEncodingHandler (const char *name);
|
| XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
|
| - xmlNewCharEncodingHandler (const char *name,
|
| - xmlCharEncodingInputFunc input,
|
| - xmlCharEncodingOutputFunc output);
|
| + xmlNewCharEncodingHandler (const char *name,
|
| + xmlCharEncodingInputFunc input,
|
| + xmlCharEncodingOutputFunc output);
|
|
|
| /*
|
| * Interfaces for encoding names and aliases.
|
| */
|
| -XMLPUBFUN int XMLCALL
|
| +XMLPUBFUN int XMLCALL
|
| xmlAddEncodingAlias (const char *name,
|
| const char *alias);
|
| -XMLPUBFUN int XMLCALL
|
| +XMLPUBFUN int XMLCALL
|
| xmlDelEncodingAlias (const char *alias);
|
| XMLPUBFUN const char * XMLCALL
|
| xmlGetEncodingAlias (const char *alias);
|
| -XMLPUBFUN void XMLCALL
|
| +XMLPUBFUN void XMLCALL
|
| xmlCleanupEncodingAliases (void);
|
| XMLPUBFUN xmlCharEncoding XMLCALL
|
| xmlParseCharEncoding (const char *name);
|
| @@ -217,12 +202,12 @@ XMLPUBFUN xmlCharEncoding XMLCALL
|
| xmlDetectCharEncoding (const unsigned char *in,
|
| int len);
|
|
|
| -XMLPUBFUN int XMLCALL
|
| +XMLPUBFUN int XMLCALL
|
| xmlCharEncOutFunc (xmlCharEncodingHandler *handler,
|
| xmlBufferPtr out,
|
| xmlBufferPtr in);
|
|
|
| -XMLPUBFUN int XMLCALL
|
| +XMLPUBFUN int XMLCALL
|
| xmlCharEncInFunc (xmlCharEncodingHandler *handler,
|
| xmlBufferPtr out,
|
| xmlBufferPtr in);
|
| @@ -230,20 +215,20 @@ XMLPUBFUN int XMLCALL
|
| xmlCharEncFirstLine (xmlCharEncodingHandler *handler,
|
| xmlBufferPtr out,
|
| xmlBufferPtr in);
|
| -XMLPUBFUN int XMLCALL
|
| +XMLPUBFUN int XMLCALL
|
| xmlCharEncCloseFunc (xmlCharEncodingHandler *handler);
|
|
|
| /*
|
| * Export a few useful functions
|
| */
|
| #ifdef LIBXML_OUTPUT_ENABLED
|
| -XMLPUBFUN int XMLCALL
|
| +XMLPUBFUN int XMLCALL
|
| UTF8Toisolat1 (unsigned char *out,
|
| int *outlen,
|
| const unsigned char *in,
|
| int *inlen);
|
| #endif /* LIBXML_OUTPUT_ENABLED */
|
| -XMLPUBFUN int XMLCALL
|
| +XMLPUBFUN int XMLCALL
|
| isolat1ToUTF8 (unsigned char *out,
|
| int *outlen,
|
| const unsigned char *in,
|
|
|