diff options
| author | 2012-05-02 12:30:00 +0800 | |
|---|---|---|
| committer | 2012-05-02 12:30:00 +0800 | |
| commit | 52016c18c3c7cbdbc78cbbe370a8401fc01370c5 (patch) | |
| tree | 1884e62fb6450e0f28b48e081ccaa45ab47168fb /libs/utils/ZipFileRO.cpp | |
| parent | 06e51a0aaf76fe53cef20c3345cf1ebda2b3461e (diff) | |
Fixed 64-bit porting issues
Fixed two issues about casting between int and pointer which
cause compilation error in 64-bit mode (eg. for 64-bit emulator)
Change-Id: I5ca9a933a239db73e56d6f27de05aa42bd06a650
Diffstat (limited to 'libs/utils/ZipFileRO.cpp')
| -rw-r--r-- | libs/utils/ZipFileRO.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/utils/ZipFileRO.cpp b/libs/utils/ZipFileRO.cpp index cad772075b..db17546ff9 100644 --- a/libs/utils/ZipFileRO.cpp +++ b/libs/utils/ZipFileRO.cpp @@ -118,7 +118,7 @@ ZipFileRO::~ZipFileRO() { */ int ZipFileRO::entryToIndex(const ZipEntryRO entry) const { - long ent = ((long) entry) - kZipEntryAdj; + long ent = ((intptr_t) entry) - kZipEntryAdj; if (ent < 0 || ent >= mHashTableSize || mHashTable[ent].name == NULL) { ALOGW("Invalid ZipEntryRO %p (%ld)\n", entry, ent); return -1; @@ -459,7 +459,7 @@ ZipEntryRO ZipFileRO::findEntryByIndex(int idx) const for (int ent = 0; ent < mHashTableSize; ent++) { if (mHashTable[ent].name != NULL) { if (idx-- == 0) - return (ZipEntryRO) (ent + kZipEntryAdj); + return (ZipEntryRO) (intptr_t)(ent + kZipEntryAdj); } } |