diff options
Diffstat (limited to 'minzip')
| -rw-r--r-- | minzip/Android.mk | 2 | ||||
| -rw-r--r-- | minzip/Hash.h | 8 | ||||
| -rw-r--r-- | minzip/Zip.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/minzip/Android.mk b/minzip/Android.mk index 045f35570..48d26bcb7 100644 --- a/minzip/Android.mk +++ b/minzip/Android.mk @@ -16,6 +16,8 @@ LOCAL_STATIC_LIBRARIES := libselinux LOCAL_MODULE := libminzip +LOCAL_CLANG := true + LOCAL_CFLAGS += -Wall include $(BUILD_STATIC_LIBRARY) diff --git a/minzip/Hash.h b/minzip/Hash.h index 8194537f3..e83eac414 100644 --- a/minzip/Hash.h +++ b/minzip/Hash.h @@ -15,6 +15,10 @@ #include <stdbool.h> #include <assert.h> +#ifdef __cplusplus +extern "C" { +#endif + /* compute the hash of an item with a specific type */ typedef unsigned int (*HashCompute)(const void* item); @@ -183,4 +187,8 @@ typedef unsigned int (*HashCalcFunc)(const void* item); void mzHashTableProbeCount(HashTable* pHashTable, HashCalcFunc calcFunc, HashCompareFunc cmpFunc); +#ifdef __cplusplus +} +#endif + #endif /*_MINZIP_HASH*/ diff --git a/minzip/Zip.c b/minzip/Zip.c index 40712e03a..a64c833f9 100644 --- a/minzip/Zip.c +++ b/minzip/Zip.c @@ -506,7 +506,6 @@ static bool processDeflatedEntry(const ZipArchive *pArchive, void *cookie) { long result = -1; - unsigned char readBuf[32 * 1024]; unsigned char procBuf[32 * 1024]; z_stream zstream; int zerr; @@ -603,7 +602,6 @@ bool mzProcessZipEntryContents(const ZipArchive *pArchive, void *cookie) { bool ret = false; - off_t oldOff; switch (pEntry->compression) { case STORED: |