commit d58ae6f59483f986d693021f5895d6230af05d99
author Jamie Gennis <jgennis@google.com> Mon May 14 08:36:55 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon May 14 08:36:55 2012 -0700
tree 188aa5c24e9565161791a4ad99325686d87bef93
parent b30f0fb45fdc967a60752cc823693462ba0e7246
parent b194ec926bf3fb3c546244b135f602ceb3a0a6b0

am b194ec92: libutils: add a tracing tag for video

* commit 'b194ec926bf3fb3c546244b135f602ceb3a0a6b0':
  libutils: add a tracing tag for video

libs/utils/ZipFileRO.cpp

diff --git a/libs/utils/ZipFileRO.cpp b/libs/utils/ZipFileRO.cpp
index cad7720..db17546 100644
--- a/libs/utils/ZipFileRO.cpp
+++ b/libs/utils/ZipFileRO.cpp
@@ -118,7 +118,7 @@
  */
 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 @@
     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);
         }
     }