diff options
author | Christopher Tate <ctate@google.com> | 2010-07-29 13:53:37 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-29 13:53:37 -0700 |
commit | 571180c4c72e0bb4f930f8971edf000a652f10f6 (patch) | |
tree | db7e1ec2ce58c64c250d035a15db3d5288d4c49e /libs | |
parent | aab985b951c4cf5ec2753ffbec516164b3c03c3a (diff) | |
parent | 466b22b76e438b3419cedbe782ab71b8ade18260 (diff) | |
download | frameworks_base-571180c4c72e0bb4f930f8971edf000a652f10f6.zip frameworks_base-571180c4c72e0bb4f930f8971edf000a652f10f6.tar.gz frameworks_base-571180c4c72e0bb4f930f8971edf000a652f10f6.tar.bz2 |
Merge "Attempt to fix the SDK build" into gingerbread
Diffstat (limited to 'libs')
-rw-r--r-- | libs/utils/StreamingZipInflater.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/utils/StreamingZipInflater.cpp b/libs/utils/StreamingZipInflater.cpp index 4e05914..7ebde78 100644 --- a/libs/utils/StreamingZipInflater.cpp +++ b/libs/utils/StreamingZipInflater.cpp @@ -23,7 +23,7 @@ #include <stddef.h> #include <assert.h> -static inline size_t min(size_t a, size_t b) { return (a < b) ? a : b; } +static inline size_t min_of(size_t a, size_t b) { return (a < b) ? a : b; } using namespace android; @@ -116,10 +116,10 @@ void StreamingZipInflater::initInflateState() { ssize_t StreamingZipInflater::read(void* outBuf, size_t count) { uint8_t* dest = (uint8_t*) outBuf; size_t bytesRead = 0; - size_t toRead = min(count, size_t(mOutTotalSize - mOutCurPosition)); + size_t toRead = min_of(count, size_t(mOutTotalSize - mOutCurPosition)); while (toRead > 0) { // First, write from whatever we already have decoded and ready to go - size_t deliverable = min(toRead, mOutLastDecoded - mOutDeliverable); + size_t deliverable = min_of(toRead, mOutLastDecoded - mOutDeliverable); if (deliverable > 0) { if (outBuf != NULL) memcpy(dest, mOutBuf + mOutDeliverable, deliverable); mOutDeliverable += deliverable; @@ -188,7 +188,7 @@ int StreamingZipInflater::readNextChunk() { assert(mDataMap == NULL); if (mInNextChunkOffset < mInTotalSize) { - size_t toRead = min(mInBufSize, mInTotalSize - mInNextChunkOffset); + size_t toRead = min_of(mInBufSize, mInTotalSize - mInNextChunkOffset); if (toRead > 0) { ssize_t didRead = ::read(mFd, mInBuf, toRead); //LOGD("Reading input chunk, size %08x didread %08x", toRead, didRead); |