diff options
| author | Elliott Hughes <enh@google.com> | 2014-10-30 23:56:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-30 23:56:46 +0000 |
| commit | 092a4128310076d918a20d09d48e6b86a8cd38b0 (patch) | |
| tree | 8040046cbcaff88933e456577fb6e2f54d2580da | |
| parent | 63546cddccc29ce568e1a87a5c1236c154864f40 (diff) | |
| parent | 8cca2fc34d04fa6eb75f019270696665785a3c8a (diff) | |
| download | libxml2-lollipop-wear-release.tar.gz | |
am 8cca2fc3: Merge "HAVE_ZLIB_H wrongly overrides LIBXML_ZLIB_ENABLED."android-wear-5.0.0_r1lollipop-wear-release
* commit '8cca2fc34d04fa6eb75f019270696665785a3c8a':
HAVE_ZLIB_H wrongly overrides LIBXML_ZLIB_ENABLED.
| -rw-r--r-- | config.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -266,7 +266,7 @@ #define HAVE_VSPRINTF 1 /* Define to 1 if you have the <zlib.h> header file. */ -#define HAVE_ZLIB_H 1 +/* #undef HAVE_ZLIB_H */ /* Because otherwise LIBXML_ZLIB_ENABLED is ignored! */ /* Define to 1 if you have the `_stat' function. */ /* #undef HAVE__STAT */ |