[git commit] Accept either __NR__lseek or __NR_lseek
Bernd Schmidt
bernds at codesourcery.com
Tue Jul 24 13:51:38 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=0e28f4b8908d69640fde017ec38cefaebe020f27
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
In llseek.c, we already allow both variants; the same needs to be done here
to avoid duplicate definitions of lseek64_nocancel.
Signed-off-by: Bernd Schmidt <bernds at codesourcery.com>
---
libc/sysdeps/linux/common/lseek.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libc/sysdeps/linux/common/lseek.c b/libc/sysdeps/linux/common/lseek.c
index 688f2d0..2c83584 100644
--- a/libc/sysdeps/linux/common/lseek.c
+++ b/libc/sysdeps/linux/common/lseek.c
@@ -39,7 +39,7 @@ off_t __NC(lseek)(int fd, off_t offset attribute_unused, int whence)
#endif
CANCELLABLE_SYSCALL(off_t, lseek, (int fd, off_t offset, int whence), (fd, offset, whence))
lt_libc_hidden(lseek)
-#if defined __UCLIBC_HAS_LFS__ && (__WORDSIZE == 64 || !defined __NR__llseek)
+#if defined __UCLIBC_HAS_LFS__ && (__WORDSIZE == 64 || (!defined __NR__llseek && !defined __NR_llseek))
strong_alias_untyped(__NC(lseek),__NC(lseek64))
strong_alias_untyped(lseek,lseek64)
lt_libc_hidden(lseek64)
More information about the uClibc-cvs
mailing list