diff options
author | Colin Cross <ccross@android.com> | 2014-02-06 03:07:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 03:07:48 +0000 |
commit | 707d321a8745accf4660bf77e33f6acb9ce6b779 (patch) | |
tree | a2f4f8069718c1f933e3b4e588bd88b6609de60c /minzip | |
parent | 4068f6aff2f898c55e6f8f3e2c92eefbb9189524 (diff) | |
parent | 2739ed9628f72813d213b7a429c4c1b8dcebe5fc (diff) | |
download | bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.zip bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.tar.gz bootable_recovery-707d321a8745accf4660bf77e33f6acb9ce6b779.tar.bz2 |
am 2739ed96: am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"
* commit '2739ed9628f72813d213b7a429c4c1b8dcebe5fc':
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 6752bce..6785d4e 100644 --- a/minzip/Zip.c +++ b/minzip/Zip.c @@ -697,7 +697,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) { @@ -727,7 +727,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; |