Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change off_t to int64_t

This commit is contained in:
rh101 2021-09-02 21:18:23 +10:00
parent 9cfc16ee38
commit 456d26628c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/base/CCUserDefault.cpp
View File

@ -382,8 +382,8 @@ void UserDefault::lazyInit()
return; return;
} }
int filesize = static_cast<int>(posix_lseek(_fd, 0, SEEK_END)); int filesize = static_cast<int>(posix_lseek64(_fd, 0, SEEK_END));
posix_lseek(_fd, 0, SEEK_SET); posix_lseek64(_fd, 0, SEEK_SET);
if (filesize < _curMapSize) { // construct a empty file mapping if (filesize < _curMapSize) { // construct a empty file mapping
posix_fsetsize(_fd, _curMapSize); posix_fsetsize(_fd, _curMapSize);

8
cocos/platform/CCPosixFileStream.cpp
View File

@ -13,7 +13,7 @@ NS_CC_BEGIN
struct PXIoF { struct PXIoF {
int(*read)(PXFileHandle& handle, void*, unsigned int); int(*read)(PXFileHandle& handle, void*, unsigned int);
off_t(*seek)(PXFileHandle& handle, off_t, int); int64_t(*seek)(PXFileHandle& handle, int64_t, int);
int(*close)(PXFileHandle& handle); int(*close)(PXFileHandle& handle);
long long(*size)(PXFileHandle& handle); long long(*size)(PXFileHandle& handle);
}; };
@ -41,7 +41,7 @@ static int pfs_posix_open(const std::string& path, FileStream::Mode mode, PXFile
// posix standard wrappers // posix standard wrappers
static int pfs_posix_read(PXFileHandle& handle, void* buf, unsigned int size) { return static_cast<int>(posix_read(handle._fd, buf, size)); } static int pfs_posix_read(PXFileHandle& handle, void* buf, unsigned int size) { return static_cast<int>(posix_read(handle._fd, buf, size)); }
static off_t pfs_posix_seek(PXFileHandle& handle, off_t offst, int origin) { return posix_lseek64(handle._fd, offst, origin); } static int64_t pfs_posix_seek(PXFileHandle& handle, int64_t offst, int origin) { return posix_lseek64(handle._fd, offst, origin); }
static int pfs_posix_close(PXFileHandle& handle) { static int pfs_posix_close(PXFileHandle& handle) {
int fd = handle._fd; int fd = handle._fd;
if (fd != -1) { if (fd != -1) {
@ -74,7 +74,7 @@ static PXIoF pfs_posix_iof = {
#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID
// android AssetManager wrappers // android AssetManager wrappers
static int pfs_asset_read(PXFileHandle& handle, void* buf, unsigned int size) { return AAsset_read(handle._asset, buf, size); } static int pfs_asset_read(PXFileHandle& handle, void* buf, unsigned int size) { return AAsset_read(handle._asset, buf, size); }
static off_t pfs_asset_seek(PXFileHandle& handle, off_t offst, int origin) { return AAsset_seek(handle._asset, offst, origin); } static int64_t pfs_asset_seek(PXFileHandle& handle, int64_t offst, int origin) { return AAsset_seek(handle._asset, offst, origin); }
static int pfs_asset_close(PXFileHandle& handle) { static int pfs_asset_close(PXFileHandle& handle) {
if (handle._asset != nullptr) { if (handle._asset != nullptr) {
AAsset_close(handle._asset); AAsset_close(handle._asset);
@ -95,7 +95,7 @@ static PXIoF pfs_asset_iof = {
// android obb // android obb
static int pfs_obb_read(PXFileHandle& handle, void* buf, unsigned int size) { return FileUtilsAndroid::getObbFile()->zfread(&handle._zfs, buf, size); } static int pfs_obb_read(PXFileHandle& handle, void* buf, unsigned int size) { return FileUtilsAndroid::getObbFile()->zfread(&handle._zfs, buf, size); }
static off_t pfs_obb_seek(PXFileHandle& handle, off_t offset, int origin) { return FileUtilsAndroid::getObbFile()->zfseek(&handle._zfs, offset, origin); } static int64_t pfs_obb_seek(PXFileHandle& handle, int64_t offset, int origin) { return FileUtilsAndroid::getObbFile()->zfseek(&handle._zfs, offset, origin); }
static int pfs_obb_close(PXFileHandle& handle) { static int pfs_obb_close(PXFileHandle& handle) {
FileUtilsAndroid::getObbFile()->zfclose(&handle._zfs); FileUtilsAndroid::getObbFile()->zfclose(&handle._zfs);
return 0; return 0;