diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-04-06 12:32:15 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:35 +0200 |
| commit | 0265be6d436a68c70bfa7788a461fc4059716a25 (patch) | |
| tree | 3314759575d453758d0ef07a4b4b8ab204eebd92 | |
| parent | 8f6fc2576cadc5d1d3ea8fcbae78096ba81a847f (diff) | |
readahead.c: add correct guards
While there, remove unneeded headers.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | libc/sysdeps/linux/common/readahead.c | 17 | ||||
| -rw-r--r-- | libc/sysdeps/linux/mips/readahead.c | 21 |
2 files changed, 13 insertions, 25 deletions
diff --git a/libc/sysdeps/linux/common/readahead.c b/libc/sysdeps/linux/common/readahead.c index cd40352d5..88d47da52 100644 --- a/libc/sysdeps/linux/common/readahead.c +++ b/libc/sysdeps/linux/common/readahead.c @@ -17,24 +17,19 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <errno.h> -#include <fcntl.h> -#include <sys/types.h> #include <sys/syscall.h> -#include <bits/wordsize.h> -#ifdef __UCLIBC_HAS_LFS__ +#if defined __NR_readahead && defined __UCLIBC_HAS_LFS__ && defined __USE_GNU -#include <_lfs_64.h> - -#ifdef __NR_readahead +# include <fcntl.h> +# include <bits/wordsize.h> # define __NR___readahead __NR_readahead # if __WORDSIZE == 64 static __inline__ _syscall3(ssize_t, __readahead, int, fd, - off_t, offset, size_t, count) + off_t, offset, size_t, count) ssize_t readahead(int fd, off_t offset, size_t count) { @@ -44,7 +39,7 @@ ssize_t readahead(int fd, off_t offset, size_t count) # else static __inline__ _syscall4(ssize_t, __readahead, int, fd, - off_t, high_offset, off_t, low_offset, size_t, count) + off_t, high_offset, off_t, low_offset, size_t, count) ssize_t readahead(int fd, off64_t offset, size_t count) { @@ -54,5 +49,3 @@ ssize_t readahead(int fd, off64_t offset, size_t count) # endif #endif - -#endif /* __UCLIBC_HAS_LFS__ */ diff --git a/libc/sysdeps/linux/mips/readahead.c b/libc/sysdeps/linux/mips/readahead.c index 9157c2762..057db9f1b 100644 --- a/libc/sysdeps/linux/mips/readahead.c +++ b/libc/sysdeps/linux/mips/readahead.c @@ -17,25 +17,20 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <errno.h> -#include <fcntl.h> -#include <sys/types.h> #include <sys/syscall.h> -#ifdef __UCLIBC_HAS_LFS__ -#include <_lfs_64.h> -# ifdef __NR_readahead +#if defined __NR_readahead && defined __UCLIBC_HAS_LFS__ && defined __USE_GNU +# include <fcntl.h> +# include <endian.h> ssize_t readahead(int fd, off64_t offset, size_t count) { -# if _MIPS_SIM == _ABIO32 +# if _MIPS_SIM == _ABIO32 return INLINE_SYSCALL (readahead, 5, fd, 0, - __LONG_LONG_PAIR ((off_t) (offset >> 32), (off_t) offset), - count); -# else /* N32 || N64 */ + __LONG_LONG_PAIR ((off_t) (offset >> 32), (off_t) offset), + count); +# else /* N32 || N64 */ return INLINE_SYSCALL (readahead, 3, fd, offset, count); -# endif -} - # endif +} #endif |