From ddb76c4644756b31be948d70aaa8ee541dd94999 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 24 Nov 2010 12:56:06 -0800 Subject: Change assets to use 64-bit API The asset system and supporting libraries were using off_t instead of off64_t to access files larger than 2GB (32-bit signed). This change replaces all off_t with off64_t and lseek64. There is a new utils/Compat.h added for Mac OS compatibility. Also fixed some size-related compiler warnings. Bug: 3205336 Change-Id: I9097b3cb7a602e811fe52f245939d8975da55e9e --- include/utils/ZipFileRO.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/utils/ZipFileRO.h') diff --git a/include/utils/ZipFileRO.h b/include/utils/ZipFileRO.h index 3c1f3caf2ef8..3a999797b476 100644 --- a/include/utils/ZipFileRO.h +++ b/include/utils/ZipFileRO.h @@ -30,6 +30,7 @@ #ifndef __LIBS_ZIPFILERO_H #define __LIBS_ZIPFILERO_H +#include #include #include #include @@ -128,7 +129,7 @@ public: * appears to be bad. */ bool getEntryInfo(ZipEntryRO entry, int* pMethod, size_t* pUncompLen, - size_t* pCompLen, off_t* pOffset, long* pModWhen, long* pCrc32) const; + size_t* pCompLen, off64_t* pOffset, long* pModWhen, long* pCrc32) const; /* * Create a new FileMap object that maps a subset of the archive. For @@ -231,7 +232,7 @@ private: int mNumEntries; /* CD directory offset in the Zip archive */ - off_t mDirectoryOffset; + off64_t mDirectoryOffset; /* * We know how many entries are in the Zip archive, so we have a -- cgit v1.2.3-59-g8ed1b