From c55f718e7341cec77ed6b74c523e306456bffac0 Mon Sep 17 00:00:00 2001 From: Peter S. Mazinger Date: Wed, 6 Apr 2011 12:37:52 +0200 Subject: [PATCH 227/396] splice,sync_file_range: mark them as GNU extensions They can't be compiled if LFS is disabled, they are using off64_t. Signed-off-by: Peter S. Mazinger --- libc/sysdeps/linux/common/splice.c | 9 +++++---- libc/sysdeps/linux/common/sync_file_range.c | 14 +++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libc/sysdeps/linux/common/splice.c b/libc/sysdeps/linux/common/splice.c index 83f348a..4a32c54 100644 --- a/libc/sysdeps/linux/common/splice.c +++ b/libc/sysdeps/linux/common/splice.c @@ -8,9 +8,10 @@ */ #include -#include -#ifdef __NR_splice -_syscall6(ssize_t, splice, int, __fdin, __off64_t *, __offin, int, __fdout, - __off64_t *, __offout, size_t, __len, unsigned int, __flags) +#if defined __NR_splice && defined __UCLIBC_HAS_LFS__ && defined __USE_GNU +# include + +_syscall6(ssize_t, splice, int, __fdin, off64_t *, __offin, int, __fdout, + off64_t *, __offout, size_t, __len, unsigned int, __flags) #endif diff --git a/libc/sysdeps/linux/common/sync_file_range.c b/libc/sysdeps/linux/common/sync_file_range.c index d24403e..b07f8e5 100644 --- a/libc/sysdeps/linux/common/sync_file_range.c +++ b/libc/sysdeps/linux/common/sync_file_range.c @@ -8,14 +8,15 @@ */ #include -#if defined __USE_GNU -#include -#if defined __NR_sync_file_range && defined __UCLIBC_HAS_LFS__ -#define __NR___syscall_sync_file_range __NR_sync_file_range +#if defined __NR_sync_file_range && defined __UCLIBC_HAS_LFS__ && defined __USE_GNU +# include + +# define __NR___syscall_sync_file_range __NR_sync_file_range static __inline__ _syscall6(int, __syscall_sync_file_range, int, fd, - off_t, offset_hi, off_t, offset_lo, - off_t, nbytes_hi, off_t, nbytes_lo, unsigned int, flags) + off_t, offset_hi, off_t, offset_lo, + off_t, nbytes_hi, off_t, nbytes_lo, unsigned int, flags) + int sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags) { return __syscall_sync_file_range(fd, @@ -24,4 +25,3 @@ int sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags) flags); } #endif -#endif -- 1.7.0.4