Use __typeof instead of adding full prototypes

diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 7bfe2cc..190263b 100644 (file)
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -38,9 +38,9 @@ libc_hidden_proto(fstat)
 libc_hidden_proto(abort)
 libc_hidden_proto(exit)
 
-extern int __libc_open (__const char *__file, int __oflag, ...) __nonnull ((1));
+extern __typeof(open) __libc_open;
 libc_hidden_proto(__libc_open)
-extern int __libc_fcntl (int __fd, int __cmd, ...);
+extern __typeof(fcntl) __libc_fcntl;
 libc_hidden_proto(__libc_fcntl)
 
 #ifndef SHARED

diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c
index c7a39bd..3553db5 100644 (file)
--- a/libc/sysdeps/linux/common/__syscall_fcntl.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl.c
@@ -12,11 +12,11 @@
 #include <fcntl.h>
 #include <bits/wordsize.h>
 
-extern int __libc_fcntl(int fd, int cmd, ...);
+extern __typeof(fcntl) __libc_fcntl;
 libc_hidden_proto(__libc_fcntl)
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64
-extern int __libc_fcntl64(int fd, int cmd, ...);
+extern __typeof(fcntl64) __libc_fcntl64;
 libc_hidden_proto(__libc_fcntl64)
 #endif
 

diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c
index 34ad2d1..cadeb84 100644 (file)
--- a/libc/sysdeps/linux/common/__syscall_fcntl64.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c
@@ -12,7 +12,7 @@
 #include <fcntl.h>
 
 #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64
-extern int __libc_fcntl64(int fd, int cmd, ...);
+extern __typeof(fcntl64) __libc_fcntl64;
 libc_hidden_proto(__libc_fcntl64)
 
 #define __NR___syscall_fcntl64 __NR_fcntl64

diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c
index d755f36..0db3b00 100644 (file)
--- a/libc/sysdeps/linux/common/open.c
+++ b/libc/sysdeps/linux/common/open.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <sys/param.h>
 
-extern int __libc_open(const char *file, int flags, ...);
+extern __typeof(open) __libc_open;
 libc_hidden_proto(__libc_open)
 
 #define __NR___syscall_open __NR_open

diff --git a/libc/sysdeps/linux/common/open64.c b/libc/sysdeps/linux/common/open64.c
index 90837cf..e194f3d 100644 (file)
--- a/libc/sysdeps/linux/common/open64.c
+++ b/libc/sysdeps/linux/common/open64.c
@@ -14,7 +14,7 @@
 # define O_LARGEFILE   0100000
 #endif
 
-extern int __libc_open (__const char *__file, int __oflag, ...) __nonnull ((1));
+extern __typeof(open) __libc_open;
 libc_hidden_proto(__libc_open)
 
 /* Open FILE with access OFLAG.  If OFLAG includes O_CREAT,