diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2011-04-16 01:04:29 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 14:00:37 +0200 |
| commit | a4b93f0bef877d6e996037696ecb1779bfe46074 (patch) | |
| tree | 211400aca8adacb2f12095ac68b2dc5dcd7aa33f /libc | |
| parent | 67b8585deac9a0a6c8f8d5c64d377ab0f1acb3a3 (diff) | |
openat*: use a static function with the different type and strong_alias_untyped
No need for hidden openat64
_lfs_64.h does not allow to compile *64.c if LFS is not enabled, remove guard
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/sysdeps/linux/common/openat.c | 12 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/openat64.c | 17 |
2 files changed, 6 insertions, 23 deletions
diff --git a/libc/sysdeps/linux/common/openat.c b/libc/sysdeps/linux/common/openat.c index 8380ec687..f6032da2c 100644 --- a/libc/sysdeps/linux/common/openat.c +++ b/libc/sysdeps/linux/common/openat.c @@ -6,19 +6,13 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#define openat __xx_openat #include <sys/syscall.h> #include <fcntl.h> -#undef openat #ifdef __NR_openat -/* The openat() prototype is varargs based, but we don't care about that - * here, so need to provide our own dedicated signature. - */ -extern int openat(int fd, const char *file, int oflag, mode_t mode); -libc_hidden_proto(openat) - -_syscall4(int, openat, int, fd, const char *, file, int, oflag, mode_t, mode) +# define __NR___syscall_openat __NR_openat +static __inline__ _syscall4(int, __syscall_openat, int, fd, const char *, file, int, oflag, mode_t, mode) +strong_alias_untyped(__syscall_openat,openat) libc_hidden_def(openat) #else /* should add emulation with open() and /proc/self/fd/ ... */ diff --git a/libc/sysdeps/linux/common/openat64.c b/libc/sysdeps/linux/common/openat64.c index 06a5819d7..eda3e7db1 100644 --- a/libc/sysdeps/linux/common/openat64.c +++ b/libc/sysdeps/linux/common/openat64.c @@ -6,27 +6,16 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ -#define openat64 __xx_openat +#include <_lfs_64.h> #include <sys/syscall.h> #include <fcntl.h> -#undef openat64 - -#ifdef __UCLIBC_HAS_LFS__ #ifdef __NR_openat -/* The openat() prototype is varargs based, but we don't care about that - * here, so need to provide our own dedicated signature. - */ -extern int openat64(int fd, const char *file, int oflag, mode_t mode); -libc_hidden_proto(openat64) - -int openat64(int fd, const char *file, int oflag, mode_t mode) +static int __openat64(int fd, const char *file, int oflag, mode_t mode) { return openat(fd, file, oflag | O_LARGEFILE, mode); } -libc_hidden_def(openat64) +strong_alias_untyped(__openat64,openat64) #else /* should add emulation with open() and /proc/self/fd/ ... */ #endif - -#endif |