diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2015-11-21 03:51:10 -0600 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2015-11-21 03:51:27 -0600 |
| commit | 16304977ca877f04b55b1f4a0848107f36af26ad (patch) | |
| tree | 27b23808ce7cfcbed006fcf8707a5e0911847e8a /xmlIO.c | |
| parent | 8eadaf82488fe3c7a106bb17e335447bef5c9bec (diff) | |
| parent | 6657afe83a38278f124ace71dc85f60420beb2d5 (diff) | |
| download | android_external_libxml2-16304977ca877f04b55b1f4a0848107f36af26ad.tar.gz android_external_libxml2-16304977ca877f04b55b1f4a0848107f36af26ad.tar.bz2 android_external_libxml2-16304977ca877f04b55b1f4a0848107f36af26ad.zip | |
Merge remote-tracking branch 'libxml2/master' into cm-13.0replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0E
Change-Id: Ie7fc53fdf2140f593e0d275ae7b445b4f4723551
Diffstat (limited to 'xmlIO.c')
| -rw-r--r-- | xmlIO.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1334,7 +1334,7 @@ xmlGzfileClose (void * context) { } #endif /* HAVE_ZLIB_H */ -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED /************************************************************************ * * * I/O for compressed file accesses * @@ -1451,7 +1451,7 @@ xmlXzfileClose (void * context) { if (ret < 0) xmlIOErr(0, "xzclose()"); return(ret); } -#endif /* HAVE_LZMA_H */ +#endif /* LIBXML_LZMA_ENABLED */ #ifdef LIBXML_HTTP_ENABLED /************************************************************************ @@ -2328,10 +2328,10 @@ xmlRegisterDefaultInputCallbacks(void) { xmlRegisterInputCallbacks(xmlGzfileMatch, xmlGzfileOpen, xmlGzfileRead, xmlGzfileClose); #endif /* HAVE_ZLIB_H */ -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED xmlRegisterInputCallbacks(xmlXzfileMatch, xmlXzfileOpen, xmlXzfileRead, xmlXzfileClose); -#endif /* HAVE_ZLIB_H */ +#endif /* LIBXML_LZMA_ENABLED */ #ifdef LIBXML_HTTP_ENABLED xmlRegisterInputCallbacks(xmlIOHTTPMatch, xmlIOHTTPOpen, @@ -2683,7 +2683,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) { #endif } #endif -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED if ((xmlInputCallbackTable[i].opencallback == xmlXzfileOpen) && (strcmp(URI, "-") != 0)) { ret->compressed = __libxml2_xzcompressed(context); @@ -3350,7 +3350,7 @@ xmlParserInputBufferGrow(xmlParserInputBufferPtr in, int len) { * try to establish compressed status of input if not done already */ if (in->compressed == -1) { -#ifdef HAVE_LZMA_H +#ifdef LIBXML_LZMA_ENABLED if (in->readcallback == xmlXzfileRead) in->compressed = __libxml2_xzcompressed(in->context); #endif |