From 9138bf01b3b21ce23cfdf15fce3f30bb9a1fbc61 Mon Sep 17 00:00:00 2001 From: "\"Steven J. Hill\"" Date: Sat, 14 Jan 2006 19:22:44 +0000 Subject: Merge from trunk. --- libc/sysdeps/linux/common/llseek.c | 20 ++++++++++---------- 1 file changed, 10 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 046f2a8c2..55200d369 100644 --- a/libc/sysdeps/linux/common/llseek.c +++ b/libc/sysdeps/linux/common/llseek.c @@ -25,7 +25,7 @@ #include #undef __OPTIMIZE__ /* We absolutely do _NOT_ want interfaces silently - * * * renamed under us or very bad things will happen... */ + * renamed under us or very bad things will happen... */ #ifdef __USE_FILE_OFFSET64 # undef __USE_FILE_OFFSET64 #endif @@ -33,7 +33,7 @@ #include #include - +#undef lseek64 #if defined __NR__llseek && defined __UCLIBC_HAS_LFS__ #ifndef INLINE_SYSCALL @@ -43,20 +43,20 @@ static inline _syscall5(int, __syscall_llseek, int, fd, off_t, offset_hi, off_t, offset_lo, loff_t *, result, int, whence); #endif -loff_t __libc_lseek64(int fd, loff_t offset, int whence) +loff_t attribute_hidden __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); } #else -extern __off_t __libc_lseek(int fildes, off_t offset, int whence); -loff_t __libc_lseek64(int fd, loff_t offset, int whence) +extern __off_t __lseek(int fildes, off_t offset, int whence) attribute_hidden; +loff_t __lseek64(int fd, loff_t offset, int whence) { - return(loff_t)(__libc_lseek(fd, (off_t) (offset & 0xffffffff), whence)); + return(loff_t)(__lseek(fd, (off_t) (offset & 0xffffffff), whence)); } #endif -weak_alias(__libc_lseek64, _llseek); -weak_alias(__libc_lseek64, llseek); -weak_alias(__libc_lseek64, lseek64); - +strong_alias(__lseek64,lseek64) +//strong_alias(__lseek64,_llseek) +//strong_alias(__lseek64,llseek) +weak_alias(__lseek64,__libc_lseek64) -- cgit v1.2.3