Browse Source

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>
Peter S. Mazinger 13 years ago
parent
commit
6507c3b84d
2 changed files with 5 additions and 3 deletions
  1. 3 2
      libc/sysdeps/linux/common/sendfile.c
  2. 2 1
      libc/sysdeps/linux/common/sendfile64.c

+ 3 - 2
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

+ 2 - 1
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