| commit | 44c4b858ec3892243cc085faf8a96b44bb8a5a9c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Jan 26 23:13:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 26 23:13:07 2016 +0000 |
| tree | f2172a63054c9d630c17cc0fb3ae8ce27faabe9b | |
| parent | d580a8b1505be000c748a380cae9ef4a510a3823 [diff] | |
| parent | a449fafc894c47305b49087d995e821e878e59c1 [diff] |
Merge "Fix lockf for LP32." am: a449fafc89 * commit 'a449fafc894c47305b49087d995e821e878e59c1': Fix lockf for LP32.
diff --git a/libc/bionic/lockf.cpp b/libc/bionic/lockf.cpp index 1510b3d..804ad68 100644 --- a/libc/bionic/lockf.cpp +++ b/libc/bionic/lockf.cpp
@@ -34,7 +34,7 @@ int lockf64(int fd, int cmd, off64_t length) { // Translate POSIX lockf into fcntl. - struct flock fl; + struct flock64 fl; memset(&fl, 0, sizeof(fl)); fl.l_whence = SEEK_CUR; fl.l_start = 0;