diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-04-16 02:14:24 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:38 +0200 |
| commit | 6507c3b84df2758ddcc44d6e761bb50a21120776 (patch) | |
| tree | 13f8e7ada52f5964dc0d19627d4d403268888f7d /libc | |
| parent | f95e1b4c613043715b2a04ee941156126a848f77 (diff) | |
correct sendfile for 32/64 bit archs
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/sysdeps/linux/common/sendfile.c | 5 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/sendfile64.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libc/sysdeps/linux/common/sendfile.c b/libc/sysdeps/linux/common/sendfile.c index 80f2e2ea4..64c200eb2 100644 --- a/libc/sysdeps/linux/common/sendfile.c +++ b/libc/sysdeps/linux/common/sendfile.c @@ -11,9 +11,10 @@ #ifdef __NR_sendfile # include <sys/sendfile.h> +# include <bits/wordsize.h> _syscall4(ssize_t, sendfile, int, out_fd, int, in_fd, __off_t *, offset, size_t, count) -# if ! defined __NR_sendfile64 && defined __UCLIBC_HAS_LFS__ -strong_alias(sendfile,sendfile64) +# if defined __UCLIBC_HAS_LFS__ && (!defined __NR_sendfile64 || __WORDSIZE == 64) +strong_alias_untyped(sendfile,sendfile64) # endif #endif diff --git a/libc/sysdeps/linux/common/sendfile64.c b/libc/sysdeps/linux/common/sendfile64.c index 2442b808c..705e6fdee 100644 --- a/libc/sysdeps/linux/common/sendfile64.c +++ b/libc/sysdeps/linux/common/sendfile64.c @@ -12,8 +12,9 @@ #include <_lfs_64.h> #include <sys/syscall.h> +#include <bits/wordsize.h> -#ifdef __NR_sendfile64 +#if defined __NR_sendfile64 && __WORDSIZE != 64 # include <sys/sendfile.h> _syscall4(ssize_t,sendfile64, int, out_fd, int, in_fd, __off64_t *, offset, size_t, count) #endif |