diff options
| author | Yabin Cui <yabinc@google.com> | 2014-11-19 20:47:18 -0800 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2014-11-19 20:47:18 -0800 |
| commit | 70160f4454f4b1a9371dd2a45d7b3e52e07e33d8 (patch) | |
| tree | 0b092a136d1e9769b7c31958666d169240204f2e /libziparchive | |
| parent | 606bb5f2e5f2913d5cb30ed87dd18da23dda1705 (diff) | |
| download | system_core-70160f4454f4b1a9371dd2a45d7b3e52e07e33d8.zip system_core-70160f4454f4b1a9371dd2a45d7b3e52e07e33d8.tar.gz system_core-70160f4454f4b1a9371dd2a45d7b3e52e07e33d8.tar.bz2 | |
kill HAVE_PREAD
Bug: 18397613
Change-Id: I3990bd0f95cf38c5a9229180a1ddc699941892fc
Diffstat (limited to 'libziparchive')
| -rw-r--r-- | libziparchive/zip_archive.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc index d5d4700..40416a0 100644 --- a/libziparchive/zip_archive.cc +++ b/libziparchive/zip_archive.cc @@ -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, |