From 3039e5421ce80d9934f4f6f6efd556afe388f10e Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Fri, 16 Dec 2005 00:22:11 +0000 Subject: Some undefs to be pedantic --- libc/sysdeps/linux/common/__syscall_fcntl.c | 3 +++ libc/sysdeps/linux/common/__syscall_fcntl64.c | 1 + libc/sysdeps/linux/common/fstat.c | 2 ++ libc/sysdeps/linux/common/fstat64.c | 1 + libc/sysdeps/linux/common/llseek.c | 2 +- libc/sysdeps/linux/common/lseek.c | 2 ++ libc/sysdeps/linux/common/lstat.c | 2 ++ libc/sysdeps/linux/common/lstat64.c | 1 + libc/sysdeps/linux/common/open.c | 2 ++ libc/sysdeps/linux/common/open64.c | 1 + libc/sysdeps/linux/common/stat.c | 2 ++ libc/sysdeps/linux/common/stat64.c | 1 + 12 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c index f094616cb..ca9aff5e7 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl.c @@ -11,10 +11,13 @@ #include #include +#undef __fcntl + #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 extern int __fcntl64(int fd, int cmd, ...) attribute_hidden; #endif +#undef fcntl #define __NR___syscall_fcntl __NR_fcntl static inline _syscall3(int, __syscall_fcntl, int, fd, int, cmd, long, arg); diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c index 763297cf0..9231808e3 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl64.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c @@ -12,6 +12,7 @@ #include #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 +#undef fcntl64 #define __NR___syscall_fcntl64 __NR_fcntl64 static inline _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg); int attribute_hidden __fcntl64(int fd, int cmd, ...) diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c index 19d678b3a..979a0db1d 100644 --- a/libc/sysdeps/linux/common/fstat.c +++ b/libc/sysdeps/linux/common/fstat.c @@ -15,6 +15,8 @@ #include "xstatconv.h" #define __NR___syscall_fstat __NR_fstat +#undef __fstat +#undef fstat static inline _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf); int attribute_hidden __fstat(int fd, struct stat *buf) diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c index 87621beab..e1e9dff5c 100644 --- a/libc/sysdeps/linux/common/fstat64.c +++ b/libc/sysdeps/linux/common/fstat64.c @@ -19,6 +19,7 @@ static inline _syscall2(int, __syscall_fstat64, int, filedes, struct kernel_stat64 *, buf); +#undef fstat64 int attribute_hidden __fstat64(int fd, struct stat64 *buf) { int result; diff --git a/libc/sysdeps/linux/common/llseek.c b/libc/sysdeps/linux/common/llseek.c index 7237e96a7..55200d369 100644 --- a/libc/sysdeps/linux/common/llseek.c +++ b/libc/sysdeps/linux/common/llseek.c @@ -33,7 +33,7 @@ #include #include - +#undef lseek64 #if defined __NR__llseek && defined __UCLIBC_HAS_LFS__ #ifndef INLINE_SYSCALL diff --git a/libc/sysdeps/linux/common/lseek.c b/libc/sysdeps/linux/common/lseek.c index ebd07512b..4eb51d322 100644 --- a/libc/sysdeps/linux/common/lseek.c +++ b/libc/sysdeps/linux/common/lseek.c @@ -11,6 +11,8 @@ #include #define __NR___lseek __NR_lseek +#undef __lseek +#undef lseek attribute_hidden _syscall3(__off_t, __lseek, int, fildes, __off_t, offset, int, whence); strong_alias(__lseek,lseek) weak_alias(__lseek,__libc_lseek) diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c index 8cacd4e78..69d663d51 100644 --- a/libc/sysdeps/linux/common/lstat.c +++ b/libc/sysdeps/linux/common/lstat.c @@ -15,6 +15,8 @@ #include "xstatconv.h" #define __NR___syscall_lstat __NR_lstat +#undef __lstat +#undef lstat static inline _syscall2(int, __syscall_lstat, const char *, file_name, struct kernel_stat *, buf); diff --git a/libc/sysdeps/linux/common/lstat64.c b/libc/sysdeps/linux/common/lstat64.c index f3ae083f1..80268d2a1 100644 --- a/libc/sysdeps/linux/common/lstat64.c +++ b/libc/sysdeps/linux/common/lstat64.c @@ -16,6 +16,7 @@ #include "xstatconv.h" #define __NR___syscall_lstat64 __NR_lstat64 +#undef lstat64 static inline _syscall2(int, __syscall_lstat64, const char *, file_name, struct kernel_stat64 *, buf); diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c index 90e990a4f..648f7d053 100644 --- a/libc/sysdeps/linux/common/open.c +++ b/libc/sysdeps/linux/common/open.c @@ -14,6 +14,8 @@ #include #include +#undef __open +#undef open #define __NR___syscall_open __NR_open static inline _syscall3(int, __syscall_open, const char *, file, int, flags, __kernel_mode_t, mode); diff --git a/libc/sysdeps/linux/common/open64.c b/libc/sysdeps/linux/common/open64.c index c1cd47141..f577d9507 100644 --- a/libc/sysdeps/linux/common/open64.c +++ b/libc/sysdeps/linux/common/open64.c @@ -28,6 +28,7 @@ #ifdef __UCLIBC_HAS_LFS__ /* Open FILE with access OFLAG. If OFLAG includes O_CREAT, a third argument is the file protection. */ +#undef open64 int attribute_hidden __open64 (const char *file, int oflag, ...) { int mode = 0; diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c index 0abd345bc..7e7fe6bec 100644 --- a/libc/sysdeps/linux/common/stat.c +++ b/libc/sysdeps/linux/common/stat.c @@ -14,6 +14,8 @@ #include "xstatconv.h" #define __NR___syscall_stat __NR_stat +#undef __stat +#undef stat static inline _syscall2(int, __syscall_stat, const char *, file_name, struct kernel_stat *, buf); diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c index d539906dd..f46e52e98 100644 --- a/libc/sysdeps/linux/common/stat64.c +++ b/libc/sysdeps/linux/common/stat64.c @@ -19,6 +19,7 @@ static inline _syscall2(int, __syscall_stat64, const char *, file_name, struct kernel_stat64 *, buf); +#undef stat64 int attribute_hidden __stat64(const char *file_name, struct stat64 *buf) { int result; -- cgit v1.2.3