From 29a778aa191e819b9a8f0a0e4c591588fe50e446 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Fri, 15 Apr 2011 23:06:40 +0200 Subject: avoid circular dependency in lseek and llseek, providing a stub lseek Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/common/llseek.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'libc/sysdeps/linux/common/llseek.c') diff --git a/libc/sysdeps/linux/common/llseek.c b/libc/sysdeps/linux/common/llseek.c index ff16917e2..8b7cb7525 100644 --- a/libc/sysdeps/linux/common/llseek.c +++ b/libc/sysdeps/linux/common/llseek.c @@ -7,8 +7,8 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ +#include <_lfs_64.h> #include -#include #include /* Newer kernel ports have llseek() instead of _llseek() */ @@ -16,24 +16,19 @@ # define __NR__llseek __NR_llseek #endif -#if defined __NR__llseek && defined __UCLIBC_HAS_LFS__ - +#ifdef __NR__llseek loff_t lseek64(int fd, loff_t offset, int whence) { loff_t result; - return (loff_t)(INLINE_SYSCALL(_llseek, 5, fd, (off_t) (offset >> 32), - (off_t) (offset & 0xffffffff), &result, whence) ?: result); + return (loff_t)INLINE_SYSCALL(_llseek, 5, fd, (off_t) (offset >> 32), + (off_t) (offset & 0xffffffff), &result, whence) ?: result; } - #else - loff_t lseek64(int fd, loff_t offset, int whence) { - return (loff_t)(lseek(fd, (off_t) (offset), whence)); + return (loff_t)lseek(fd, (off_t) (offset), whence); } - #endif - #ifndef __LINUXTHREADS_OLD__ libc_hidden_def(lseek64) #else -- cgit v1.2.3