From 24d6be40bc0984e0e738f2c2210b0cf475d54284 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 15 Feb 2006 11:48:36 +0000 Subject: Move hidden prototypes to proper place and get rid of duplicate hidden --- libc/sysdeps/linux/common/getdents.c | 10 +++++----- libc/sysdeps/linux/common/getdents64.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c index 3faef4bfe..a04c41d30 100644 --- a/libc/sysdeps/linux/common/getdents.c +++ b/libc/sysdeps/linux/common/getdents.c @@ -24,9 +24,6 @@ * version / arch details. */ -libc_hidden_proto(memcpy) -libc_hidden_proto(lseek) - #ifndef offsetof # define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) #endif @@ -39,10 +36,13 @@ struct kernel_dirent char d_name[256]; }; -ssize_t attribute_hidden __getdents (int fd, char *buf, size_t nbytes); +ssize_t __getdents (int fd, char *buf, size_t nbytes) attribute_hidden; #if ! defined __UCLIBC_HAS_LFS__ || ! defined __NR_getdents64 +libc_hidden_proto(memcpy) +libc_hidden_proto(lseek) + #define __NR___syscall_getdents __NR_getdents static inline _syscall3(int, __syscall_getdents, int, fd, unsigned char *, kdirp, size_t, count); @@ -105,7 +105,7 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes) libc_hidden_proto(memmove) -extern attribute_hidden __typeof(__getdents) __getdents64; +extern __typeof(__getdents) __getdents64 attribute_hidden; ssize_t __getdents (int fd, char *buf, size_t nbytes) { struct dirent *dp; diff --git a/libc/sysdeps/linux/common/getdents64.c b/libc/sysdeps/linux/common/getdents64.c index fcc6903b5..2ed7f42ee 100644 --- a/libc/sysdeps/linux/common/getdents64.c +++ b/libc/sysdeps/linux/common/getdents64.c @@ -39,8 +39,8 @@ struct kernel_dirent64 # define __NR___syscall_getdents64 __NR_getdents64 static inline _syscall3(int, __syscall_getdents64, int, fd, unsigned char *, dirp, size_t, count); -ssize_t attribute_hidden __getdents64 (int fd, char *buf, size_t nbytes); -ssize_t attribute_hidden __getdents64 (int fd, char *buf, size_t nbytes) +ssize_t __getdents64 (int fd, char *buf, size_t nbytes) attribute_hidden; +ssize_t __getdents64 (int fd, char *buf, size_t nbytes) { struct dirent64 *dp; off64_t last_offset = -1; -- cgit v1.2.3