| commit | bc65c019404b2f9b5a6894e42a30f1c398d6da99 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 13 12:18:17 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Aug 13 12:18:17 2024 +0000 |
| tree | 7097a7696da7feaced0e103b787a5172598060f3 | |
| parent | 3930264c7f88d3803d51bce0fa0b3e8c50c4d99e [diff] | |
| parent | 995eddd5ea69c51d2541c106e9693753dfd69110 [diff] |
Merge "Alias lockf and lock64 on LP64." into main
diff --git a/libc/bionic/lockf.cpp b/libc/bionic/lockf.cpp index 804ad68..54e13f5 100644 --- a/libc/bionic/lockf.cpp +++ b/libc/bionic/lockf.cpp
@@ -68,6 +68,12 @@ return -1; } +#if defined(__LP64__) +// For LP64, off_t == off64_t. +__strong_alias(lockf, lockf64); +#else +// For ILP32 we need a shim that truncates the off64_t to off_t. int lockf(int fd, int cmd, off_t length) { return lockf64(fd, cmd, length); } +#endif