diff options
| author | Colin Cross <ccross@android.com> | 2014-02-06 02:59:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 02:59:38 +0000 |
| commit | 2739ed9628f72813d213b7a429c4c1b8dcebe5fc (patch) | |
| tree | 447fee2410642f9723e34f6eddf8e2d006a3f56b /minzip | |
| parent | fd84f65dcda3c7e4b42c71a7df85efebdbf7ea7a (diff) | |
| parent | a5d105e2397d81537facd93fd8a9d3e263d57dc9 (diff) | |
| download | bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.zip bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.tar.gz bootable_recovery-2739ed9628f72813d213b7a429c4c1b8dcebe5fc.tar.bz2 | |
am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"
* commit 'a5d105e2397d81537facd93fd8a9d3e263d57dc9':
recovery: fix building with pointer-to-int errors turned on
Diffstat (limited to 'minzip')
| -rw-r--r-- | minzip/Zip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/minzip/Zip.c b/minzip/Zip.c index 439e5d9..f4f38a9 100644 --- a/minzip/Zip.c +++ b/minzip/Zip.c @@ -772,7 +772,7 @@ bool mzReadZipEntry(const ZipArchive* pArchive, const ZipEntry* pEntry, static bool writeProcessFunction(const unsigned char *data, int dataLen, void *cookie) { - int fd = (int)cookie; + int fd = (int)(intptr_t)cookie; ssize_t soFar = 0; while (true) { @@ -802,7 +802,7 @@ bool mzExtractZipEntryToFile(const ZipArchive *pArchive, const ZipEntry *pEntry, int fd) { bool ret = mzProcessZipEntryContents(pArchive, pEntry, writeProcessFunction, - (void*)fd); + (void*)(intptr_t)fd); if (!ret) { LOGE("Can't extract entry to file.\n"); return false; |