summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2016-04-15 17:25:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-04-15 17:25:28 +0000
commit6233bff5bd04bb6030929ed6f55e34dde09aa8f3 (patch)
treec0f0fdb470cdfcd3b960fe3c33dadc949cd2ee3a
parentdb5a850591f5b28b28be9684c1ebe82a32743ff3 (diff)
parent5b2cfd8b195d8f0fb69c4fe57223c648dfa4c4f2 (diff)
Merge "OpenJdkJVM: Fix Mac OS build."
-rw-r--r--runtime/openjdkjvm/OpenjdkJvm.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/runtime/openjdkjvm/OpenjdkJvm.cc b/runtime/openjdkjvm/OpenjdkJvm.cc
index d010bab12f..1f33651243 100644
--- a/runtime/openjdkjvm/OpenjdkJvm.cc
+++ b/runtime/openjdkjvm/OpenjdkJvm.cc
@@ -116,12 +116,18 @@ JNIEXPORT jint JVM_Write(jint fd, char* buf, jint nbytes) {
/* posix lseek() */
JNIEXPORT jlong JVM_Lseek(jint fd, jlong offset, jint whence) {
+#if !defined(__APPLE__)
// NOTE: Using TEMP_FAILURE_RETRY here is busted for LP32 on glibc - the return
// value will be coerced into an int32_t.
//
// lseek64 isn't specified to return EINTR so it shouldn't be necessary
// anyway.
return lseek64(fd, offset, whence);
+#else
+ // NOTE: This code is compiled for Mac OS but isn't ever run on that
+ // platform.
+ return lseek(fd, offset, whence);
+#endif
}
/*