openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "libziparchive: fix mac os breakage" am: 390f3b364c am: 7cfe1d69b0 

am: cdbadafb4a

Change-Id: Ie327879eaea542911603640e36f0d867e05afd61
This commit is contained in:
Adam Lesinski 2017-03-23 21:12:58 +00:00 committed by android-build-merger
parent 02842f2138 cdbadafb4a
commit aa1d43230c
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libutils/include/utils/Compat.h
View File

@ -37,6 +37,10 @@ static inline ssize_t pwrite64(int fd, const void* buf, size_t nbytes, off64_t o
return pwrite(fd, buf, nbytes, offset);
}
static inline int ftruncate64(int fd, off64_t length) {
return ftruncate(fd, length);
}
#endif /* __APPLE__ */
#if defined(_WIN32)

1
libziparchive/zip_writer.cc
View File

@ -25,6 +25,7 @@
#include <vector>
#include "android-base/logging.h"
#include "utils/Compat.h"
#include "utils/Log.h"
#include "entry_name_utils-inl.h"

4
libziparchive/zip_writer_test.cc
View File

@ -377,7 +377,7 @@ TEST_F(zipwriter, TruncateFileAfterBackup) {
ASSERT_EQ(0, writer.WriteBytes(data.data(), data.size()));
ASSERT_EQ(0, writer.FinishEntry());
off64_t before_len = ftello64(file_);
off_t before_len = ftello(file_);
ZipWriter::FileEntry entry;
ASSERT_EQ(0, writer.GetLastEntry(&entry));
@ -385,7 +385,7 @@ TEST_F(zipwriter, TruncateFileAfterBackup) {
ASSERT_EQ(0, writer.Finish());
off64_t after_len = ftello64(file_);
off_t after_len = ftello(file_);
ASSERT_GT(before_len, after_len);
}