ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am 46ee85fc: Merge "kill HAVE_PREAD"

Browse source 
* commit '46ee85fcc301471aff9d95a817599349570dcef8':
  kill HAVE_PREAD
This commit is contained in:
Yabin Cui 2014-11-20 05:21:54 +00:00 • committed by Android Git Automerger
commit ebd8ba674d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libziparchive/zip_archive.cc
View file

@ -744,7 +744,7 @@ static int32_t UpdateEntryFromDataDescriptor(int fd,
// as a side effect of this call. // as a side effect of this call.
static inline ssize_t ReadAtOffset(int fd, uint8_t* buf, size_t len, static inline ssize_t ReadAtOffset(int fd, uint8_t* buf, size_t len,
off64_t off) { off64_t off) {
#ifdef HAVE_PREAD #if !defined(_WIN32)
return TEMP_FAILURE_RETRY(pread64(fd, buf, len, off)); return TEMP_FAILURE_RETRY(pread64(fd, buf, len, off));
#else #else
// The only supported platform that doesn't support pread at the moment // The only supported platform that doesn't support pread at the moment
@ -756,7 +756,7 @@ static inline ssize_t ReadAtOffset(int fd, uint8_t* buf, size_t len,
} }
return TEMP_FAILURE_RETRY(read(fd, buf, len)); return TEMP_FAILURE_RETRY(read(fd, buf, len));
#endif // HAVE_PREAD #endif
} }
static int32_t FindEntry(const ZipArchive* archive, const int ent, static int32_t FindEntry(const ZipArchive* archive, const int ent,