commit 46ee85fcc301471aff9d95a817599349570dcef8
author Yabin Cui <yabinc@google.com> Thu Nov 20 05:15:04 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 20 05:15:04 2014 +0000
tree 0b092a136d1e9769b7c31958666d169240204f2e
parent 606bb5f2e5f2913d5cb30ed87dd18da23dda1705
parent 70160f4454f4b1a9371dd2a45d7b3e52e07e33d8

Merge "kill HAVE_PREAD"

libziparchive/zip_archive.cc

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 @@
 // 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 @@
   }
 
   return TEMP_FAILURE_RETRY(read(fd, buf, len));
-#endif  // HAVE_PREAD
+#endif
 }
 
 static int32_t FindEntry(const ZipArchive* archive, const int ent,