am ebd8ba67: am 46ee85fc: Merge "kill HAVE_PREAD"

* commit 'ebd8ba674d5ccc9764efc3d2225a89b182aa1591':
  kill HAVE_PREAD
This commit is contained in:
Yabin Cui 2014-11-20 05:26:15 +00:00 committed by Android Git Automerger
commit 6b35b295d3
1 changed files with 2 additions and 2 deletions

View File

@ -744,7 +744,7 @@ static int32_t UpdateEntryFromDataDescriptor(int fd,
// as a side effect of this call.
static inline ssize_t ReadAtOffset(int fd, uint8_t* buf, size_t len,
off64_t off) {
#ifdef HAVE_PREAD
#if !defined(_WIN32)
return TEMP_FAILURE_RETRY(pread64(fd, buf, len, off));
#else
// 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));
#endif // HAVE_PREAD
#endif
}
static int32_t FindEntry(const ZipArchive* archive, const int ent,