diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-10 17:33:45 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-10 17:33:45 +0000 |
| commit | 3d6648de144081c92358b36d88b25efc6e0cef5a (patch) | |
| tree | e22c2cfc079f0737c4567cc66afb271a84b3c752 /libc/sysdeps | |
| parent | 7783231adcdd13c7d3c9b8f74f43f1a6f489d873 (diff) | |
remove __libc_fcntl[64]
Diffstat (limited to 'libc/sysdeps')
| -rw-r--r-- | libc/sysdeps/linux/common/__syscall_fcntl.c | 22 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/__syscall_fcntl64.c | 10 |
2 files changed, 6 insertions, 26 deletions
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c index e95c6fe2d..8b896b4f7 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl.c @@ -12,19 +12,11 @@ #include <fcntl.h> #include <bits/wordsize.h> -extern __typeof(fcntl) __libc_fcntl; -libc_hidden_proto(__libc_fcntl) - -#if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 -extern __typeof(fcntl64) __libc_fcntl64; -libc_hidden_proto(__libc_fcntl64) -#endif - #define __NR___syscall_fcntl __NR_fcntl static __always_inline _syscall3(int, __syscall_fcntl, int, fd, int, cmd, long, arg) -int __libc_fcntl(int fd, int cmd, ...) +int fcntl(int fd, int cmd, ...) { long arg; va_list list; @@ -36,7 +28,7 @@ int __libc_fcntl(int fd, int cmd, ...) #if __WORDSIZE == 32 if (cmd == F_GETLK64 || cmd == F_SETLK64 || cmd == F_SETLKW64) { #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 - return __libc_fcntl64(fd, cmd, arg); + return fcntl64(fd, cmd, arg); #else __set_errno(ENOSYS); return -1; @@ -46,14 +38,8 @@ int __libc_fcntl(int fd, int cmd, ...) return (__syscall_fcntl(fd, cmd, arg)); } -libc_hidden_def(__libc_fcntl) +libc_hidden_def(fcntl) -/* libc_hidden_proto(fcntl) */ -weak_alias(__libc_fcntl,fcntl) -libc_hidden_weak(fcntl) #if ! defined __NR_fcntl64 && defined __UCLIBC_HAS_LFS__ -strong_alias(__libc_fcntl,__libc_fcntl64) -/* libc_hidden_proto(fcntl64) */ -weak_alias(__libc_fcntl,fcntl64) -libc_hidden_weak(fcntl64) +strong_alias(fcntl,fcntl64) #endif diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c index cd5c59bd2..e8782e967 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl64.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c @@ -12,12 +12,10 @@ #include <fcntl.h> #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 -extern __typeof(fcntl64) __libc_fcntl64; -libc_hidden_proto(__libc_fcntl64) #define __NR___syscall_fcntl64 __NR_fcntl64 static __inline__ _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg) -int __libc_fcntl64(int fd, int cmd, ...) +int fcntl64(int fd, int cmd, ...) { long arg; va_list list; @@ -28,9 +26,5 @@ int __libc_fcntl64(int fd, int cmd, ...) return (__syscall_fcntl64(fd, cmd, arg)); } -libc_hidden_def(__libc_fcntl64) - -/* libc_hidden_proto(fcntl64) */ -strong_alias(__libc_fcntl64,fcntl64) -libc_hidden_weak(fcntl64) +libc_hidden_def(fcntl64) #endif |