next portion of libc_hidden_proto removal

77 files changed, 95 insertions, 95 deletions

diff --git a/libc/sysdeps/linux/alpha/sigprocmask.c b/libc/sysdeps/linux/alpha/sigprocmask.c
index 32f0275d9..f5e3c8d91 100644
--- a/libc/sysdeps/linux/alpha/sigprocmask.c
+++ b/libc/sysdeps/linux/alpha/sigprocmask.c
@@ -27,7 +27,7 @@
 
 static __inline__ _syscall2(int, osf_sigprocmask, int, how, unsigned long int, setval)
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 int
 sigprocmask (int how, const sigset_t *set, sigset_t *oset)
 {
diff --git a/libc/sysdeps/linux/arm/brk.c b/libc/sysdeps/linux/arm/brk.c
index 47179901f..aaa71cc6d 100644
--- a/libc/sysdeps/linux/arm/brk.c
+++ b/libc/sysdeps/linux/arm/brk.c
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
diff --git a/libc/sysdeps/linux/arm/ioperm.c b/libc/sysdeps/linux/arm/ioperm.c
index 6a020365e..daa8b72a1 100644
--- a/libc/sysdeps/linux/arm/ioperm.c
+++ b/libc/sysdeps/linux/arm/ioperm.c
@@ -49,15 +49,15 @@
 libc_hidden_proto(ioperm)
 
 libc_hidden_proto(readlink)
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 libc_hidden_proto(sscanf)
 libc_hidden_proto(fscanf)
 /* libc_hidden_proto(fprintf) */
-libc_hidden_proto(fgets)
-libc_hidden_proto(fopen)
+/* libc_hidden_proto(fgets) */
+/* libc_hidden_proto(fopen) */
 /* libc_hidden_proto(fclose) */
 /* Experimentally off - libc_hidden_proto(strcmp) */
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 /* libc_hidden_proto(close) */
 
 #include <linux/version.h>
diff --git a/libc/sysdeps/linux/arm/sigaction.c b/libc/sysdeps/linux/arm/sigaction.c
index 552ac17bf..9c1160866 100644
--- a/libc/sysdeps/linux/arm/sigaction.c
+++ b/libc/sysdeps/linux/arm/sigaction.c
@@ -120,7 +120,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/avr32/brk.c b/libc/sysdeps/linux/avr32/brk.c
index a54b49a61..7d34405dc 100644
--- a/libc/sysdeps/linux/avr32/brk.c
+++ b/libc/sysdeps/linux/avr32/brk.c
@@ -9,7 +9,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 void *__curbrk attribute_hidden = 0;
 
diff --git a/libc/sysdeps/linux/avr32/mmap.c b/libc/sysdeps/linux/avr32/mmap.c
index 92d3fe45a..b3d8b98c1 100644
--- a/libc/sysdeps/linux/avr32/mmap.c
+++ b/libc/sysdeps/linux/avr32/mmap.c
@@ -11,7 +11,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 static _syscall6(__ptr_t, mmap2, __ptr_t, addr, size_t, len, int, prot,
 		 int, flags, int, fd, __off_t, pgoff)
diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c
index 5a1ec9eae..05caec7ee 100644
--- a/libc/sysdeps/linux/avr32/sigaction.c
+++ b/libc/sysdeps/linux/avr32/sigaction.c
@@ -55,7 +55,7 @@ int __libc_sigaction(int signum, const struct sigaction *act,
 }
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction, sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/bfin/brk.c b/libc/sysdeps/linux/bfin/brk.c
index 64480453e..88b82cf64 100644
--- a/libc/sysdeps/linux/bfin/brk.c
+++ b/libc/sysdeps/linux/bfin/brk.c
@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 /* This must be initialized data because commons can't have aliases.  */
 void * __curbrk attribute_hidden = 0;
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c
index a3fb74fa3..3860050f8 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl.c
@@ -48,7 +48,7 @@ int __libc_fcntl(int fd, int cmd, ...)
 }
 libc_hidden_def(__libc_fcntl)
 
-libc_hidden_proto(fcntl)
+/* libc_hidden_proto(fcntl) */
 weak_alias(__libc_fcntl,fcntl)
 libc_hidden_weak(fcntl)
 #if ! defined __NR_fcntl64 && defined __UCLIBC_HAS_LFS__
diff --git a/libc/sysdeps/linux/common/_exit.c b/libc/sysdeps/linux/common/_exit.c
index 4a654a6f1..518a6d2e8 100644
--- a/libc/sysdeps/linux/common/_exit.c
+++ b/libc/sysdeps/linux/common/_exit.c
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(_exit) */
 
 #ifndef INLINE_SYSCALL
 #define INLINE_SYSCALL(name, nr, args...) __syscall_exit (args)
diff --git a/libc/sysdeps/linux/common/clock_gettime.c b/libc/sysdeps/linux/common/clock_gettime.c
index f0f1ae44f..f1db8ad7c 100644
--- a/libc/sysdeps/linux/common/clock_gettime.c
+++ b/libc/sysdeps/linux/common/clock_gettime.c
@@ -15,7 +15,7 @@
 #ifdef __NR_clock_gettime
 _syscall2(int, clock_gettime, clockid_t, clock_id, struct timespec*, tp)
 #else
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 int clock_gettime(clockid_t clock_id, struct timespec* tp)
 {
diff --git a/libc/sysdeps/linux/common/dl-osinfo.h b/libc/sysdeps/linux/common/dl-osinfo.h
index a038ea31e..195c64803 100644
--- a/libc/sysdeps/linux/common/dl-osinfo.h
+++ b/libc/sysdeps/linux/common/dl-osinfo.h
@@ -21,10 +21,10 @@
 
 #  ifdef IS_IN_libc
 #include <fcntl.h>
-libc_hidden_proto(open)
-libc_hidden_proto(read)
+/* libc_hidden_proto(open) */
+/* libc_hidden_proto(read) */
 /* libc_hidden_proto(close) */
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 #   define OPEN open
 #   define READ read
 #   define CLOSE close
diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
index 8d1cfdcd0..34a6e7b46 100644
--- a/libc/sysdeps/linux/common/fstat.c
+++ b/libc/sysdeps/linux/common/fstat.c
@@ -18,7 +18,7 @@
 
 #undef fstat64
 
-libc_hidden_proto(fstat)
+/* libc_hidden_proto(fstat) */
 
 #define __NR___syscall_fstat __NR_fstat
 static __inline__ _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf)
diff --git a/libc/sysdeps/linux/common/getcwd.c b/libc/sysdeps/linux/common/getcwd.c
index ddeb483d6..07e1481e4 100644
--- a/libc/sysdeps/linux/common/getcwd.c
+++ b/libc/sysdeps/linux/common/getcwd.c
@@ -25,7 +25,7 @@ libc_hidden_proto(getpagesize)
 libc_hidden_proto(opendir)
 libc_hidden_proto(readdir)
 libc_hidden_proto(closedir)
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 #ifdef __NR_getcwd
 
diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c
index 17f1ddc52..0baf47eb4 100644
--- a/libc/sysdeps/linux/common/getdents.c
+++ b/libc/sysdeps/linux/common/getdents.c
@@ -72,7 +72,7 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes)
 #elif ! defined __UCLIBC_HAS_LFS__ || ! defined __NR_getdents64
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(lseek) */
 
 ssize_t __getdents (int fd, char *buf, size_t nbytes)
 {
diff --git a/libc/sysdeps/linux/common/getdirname.c b/libc/sysdeps/linux/common/getdirname.c
index 5938d7257..2eba80c6e 100644
--- a/libc/sysdeps/linux/common/getdirname.c
+++ b/libc/sysdeps/linux/common/getdirname.c
@@ -27,11 +27,11 @@
 
 /* Experimentally off - libc_hidden_proto(strdup) */
 libc_hidden_proto(getcwd)
-libc_hidden_proto(getenv)
+/* libc_hidden_proto(getenv) */
 #ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(stat64)
 #else
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 #endif
 
 /* Return a malloc'd string containing the current directory name.
diff --git a/libc/sysdeps/linux/common/getpid.c b/libc/sysdeps/linux/common/getpid.c
index 47fc96735..d78c6e906 100644
--- a/libc/sysdeps/linux/common/getpid.c
+++ b/libc/sysdeps/linux/common/getpid.c
@@ -16,6 +16,6 @@ extern __typeof(getpid) __libc_getpid;
 #endif
 #define __NR___libc_getpid __NR_getpid
 _syscall0(pid_t, __libc_getpid)
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 weak_alias(__libc_getpid, getpid)
 libc_hidden_weak(getpid)
diff --git a/libc/sysdeps/linux/common/getppid.c b/libc/sysdeps/linux/common/getppid.c
index a167750dd..7adeb2f8b 100644
--- a/libc/sysdeps/linux/common/getppid.c
+++ b/libc/sysdeps/linux/common/getppid.c
@@ -12,7 +12,7 @@
 #ifdef	__NR_getppid
 _syscall0(pid_t, getppid)
 #else
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 pid_t getppid(void)
 {
 	return getpid();
diff --git a/libc/sysdeps/linux/common/gettimeofday.c b/libc/sysdeps/linux/common/gettimeofday.c
index 620eed3b2..663cc3b50 100644
--- a/libc/sysdeps/linux/common/gettimeofday.c
+++ b/libc/sysdeps/linux/common/gettimeofday.c
@@ -10,7 +10,7 @@
 #include <sys/syscall.h>
 #include <sys/time.h>
 
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 #ifdef __USE_BSD
 _syscall2(int, gettimeofday, struct timeval *, tv, struct timezone *, tz)
 #else
diff --git a/libc/sysdeps/linux/common/ioctl.c b/libc/sysdeps/linux/common/ioctl.c
index 51f83a372..990558ef1 100644
--- a/libc/sysdeps/linux/common/ioctl.c
+++ b/libc/sysdeps/linux/common/ioctl.c
@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <sys/ioctl.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 #define __NR___syscall_ioctl __NR_ioctl
 static __always_inline
diff --git a/libc/sysdeps/linux/common/longjmp.c b/libc/sysdeps/linux/common/longjmp.c
index a54f01f48..672754a73 100644
--- a/libc/sysdeps/linux/common/longjmp.c
+++ b/libc/sysdeps/linux/common/longjmp.c
@@ -20,7 +20,7 @@
 #include <setjmp.h>
 #include <signal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 extern void __longjmp (__jmp_buf __env, int __val) attribute_noreturn;
 libc_hidden_proto(__longjmp)
diff --git a/libc/sysdeps/linux/common/lseek.c b/libc/sysdeps/linux/common/lseek.c
index 61675cfd4..8c0525d07 100644
--- a/libc/sysdeps/linux/common/lseek.c
+++ b/libc/sysdeps/linux/common/lseek.c
@@ -26,6 +26,6 @@ __off_t __libc_lseek(int fildes, __off_t offset, int whence)
 #endif
 libc_hidden_def(__libc_lseek)
 
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(lseek) */
 weak_alias(__libc_lseek,lseek)
 libc_hidden_weak(lseek)
diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
index 4c67c1987..fb07dfe10 100644
--- a/libc/sysdeps/linux/common/lstat.c
+++ b/libc/sysdeps/linux/common/lstat.c
@@ -18,7 +18,7 @@
 
 #undef lstat64
 
-libc_hidden_proto(lstat)
+/* libc_hidden_proto(lstat) */
 
 #define __NR___syscall_lstat __NR_lstat
 static __inline__ _syscall2(int, __syscall_lstat,
diff --git a/libc/sysdeps/linux/common/mmap.c b/libc/sysdeps/linux/common/mmap.c
index af9685a00..d5b0b85df 100644
--- a/libc/sysdeps/linux/common/mmap.c
+++ b/libc/sysdeps/linux/common/mmap.c
@@ -14,7 +14,7 @@
 
 #ifdef __NR_mmap
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #ifdef __UCLIBC_MMAP_HAS_6_ARGS__
 
@@ -45,7 +45,7 @@ libc_hidden_def(mmap)
 
 #elif defined(__NR_mmap2)
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #define __NR___syscall_mmap2 __NR_mmap2
 static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
diff --git a/libc/sysdeps/linux/common/mmap64.c b/libc/sysdeps/linux/common/mmap64.c
index 3abfd566b..2b10e5710 100644
--- a/libc/sysdeps/linux/common/mmap64.c
+++ b/libc/sysdeps/linux/common/mmap64.c
@@ -15,7 +15,7 @@
 #include <sys/syscall.h>
 #include <bits/uClibc_page.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 # if !defined __NR_mmap2 || !defined _syscall6
 
diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c
index f9b10d8c0..a39093bd1 100644
--- a/libc/sysdeps/linux/common/open.c
+++ b/libc/sysdeps/linux/common/open.c
@@ -37,7 +37,7 @@ int __libc_open(const char *file, int oflag, ...)
 }
 libc_hidden_def(__libc_open)
 
-libc_hidden_proto(open)
+/* libc_hidden_proto(open) */
 weak_alias(__libc_open,open)
 libc_hidden_weak(open)
 
diff --git a/libc/sysdeps/linux/common/poll.c b/libc/sysdeps/linux/common/poll.c
index 256581c92..764a9aa7b 100644
--- a/libc/sysdeps/linux/common/poll.c
+++ b/libc/sysdeps/linux/common/poll.c
@@ -229,6 +229,6 @@ int __libc_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 }
 
 #endif
-libc_hidden_proto(poll)
+/* libc_hidden_proto(poll) */
 weak_alias(__libc_poll,poll)
 libc_hidden_weak(poll)
diff --git a/libc/sysdeps/linux/common/pread_write.c b/libc/sysdeps/linux/common/pread_write.c
index eb96c3e91..353cf1ac2 100644
--- a/libc/sysdeps/linux/common/pread_write.c
+++ b/libc/sysdeps/linux/common/pread_write.c
@@ -75,9 +75,9 @@ weak_alias(__libc_pwrite64,pwrite64)
 #endif /* __NR_pwrite */
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
diff --git a/libc/sysdeps/linux/common/pselect.c b/libc/sysdeps/linux/common/pselect.c
index 3a958fcfc..567728f51 100644
--- a/libc/sysdeps/linux/common/pselect.c
+++ b/libc/sysdeps/linux/common/pselect.c
@@ -25,7 +25,7 @@
 
 extern __typeof(pselect) __libc_pselect;
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 libc_hidden_proto(select)
 
 
diff --git a/libc/sysdeps/linux/common/read.c b/libc/sysdeps/linux/common/read.c
index 965787d52..cfa857319 100644
--- a/libc/sysdeps/linux/common/read.c
+++ b/libc/sysdeps/linux/common/read.c
@@ -13,6 +13,6 @@
 extern __typeof(read) __libc_read;
 #define __NR___libc_read __NR_read
 _syscall3(ssize_t, __libc_read, int, fd, __ptr_t, buf, size_t, count)
-libc_hidden_proto(read)
+/* libc_hidden_proto(read) */
 weak_alias(__libc_read,read)
 libc_hidden_weak(read)
diff --git a/libc/sysdeps/linux/common/sbrk.c b/libc/sysdeps/linux/common/sbrk.c
index 734a4ce01..9ec1db3db 100644
--- a/libc/sysdeps/linux/common/sbrk.c
+++ b/libc/sysdeps/linux/common/sbrk.c
@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 /* Defined in brk.c.  */
 extern void *__curbrk attribute_hidden;
@@ -15,7 +15,7 @@ extern void *__curbrk attribute_hidden;
 /* Extend the process's data space by INCREMENT.
    If INCREMENT is negative, shrink data space by - INCREMENT.
    Return start of new space allocated, or -1 for errors.  */
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void * sbrk (intptr_t increment)
 {
     void *oldbrk;
diff --git a/libc/sysdeps/linux/common/sched_setaffinity.c b/libc/sysdeps/linux/common/sched_setaffinity.c
index 815fe8017..aec032eab 100644
--- a/libc/sysdeps/linux/common/sched_setaffinity.c
+++ b/libc/sysdeps/linux/common/sched_setaffinity.c
@@ -31,7 +31,7 @@
 #include <alloca.h>
 
 #if defined __NR_sched_setaffinity
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 
 #define __NR___syscall_sched_setaffinity __NR_sched_setaffinity
 static __inline__ _syscall3(int, __syscall_sched_setaffinity, __kernel_pid_t, pid,
diff --git a/libc/sysdeps/linux/common/sigprocmask.c b/libc/sysdeps/linux/common/sigprocmask.c
index 7da17bc77..a9a913e10 100644
--- a/libc/sysdeps/linux/common/sigprocmask.c
+++ b/libc/sysdeps/linux/common/sigprocmask.c
@@ -14,7 +14,7 @@
 
 #undef sigprocmask
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 #ifdef __NR_rt_sigprocmask
 
diff --git a/libc/sysdeps/linux/common/sigqueue.c b/libc/sysdeps/linux/common/sigqueue.c
index f941d6354..5e79bc667 100644
--- a/libc/sysdeps/linux/common/sigqueue.c
+++ b/libc/sysdeps/linux/common/sigqueue.c
@@ -24,7 +24,7 @@
 #include <sys/syscall.h>
 #if defined __USE_POSIX199309
 
-libc_hidden_proto(getpid)
+/* libc_hidden_proto(getpid) */
 libc_hidden_proto(getuid)
 /* Experimentally off - libc_hidden_proto(memset) */
 
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c
index 08ef00d6a..b939b4ea0 100644
--- a/libc/sysdeps/linux/common/ssp.c
+++ b/libc/sysdeps/linux/common/ssp.c
@@ -37,14 +37,14 @@ libc_hidden_proto(syslog)
 libc_hidden_proto(closelog)
 #endif
 
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 libc_hidden_proto(sigfillset)
 libc_hidden_proto(sigdelset)
-libc_hidden_proto(sigprocmask)
-libc_hidden_proto(write)
+/* libc_hidden_proto(sigprocmask) */
+/* libc_hidden_proto(write) */
 libc_hidden_proto(kill)
-libc_hidden_proto(getpid)
-libc_hidden_proto(_exit)
+/* libc_hidden_proto(getpid) */
+/* libc_hidden_proto(_exit) */
 
 static void block_signals(void)
 {
diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
index 160f38aab..c2e02ae34 100644
--- a/libc/sysdeps/linux/common/stat.c
+++ b/libc/sysdeps/linux/common/stat.c
@@ -18,7 +18,7 @@
 
 #undef stat64
 
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 
 #define __NR___syscall_stat __NR_stat
 #undef stat
diff --git a/libc/sysdeps/linux/common/time.c b/libc/sysdeps/linux/common/time.c
index 9563b4113..a40d8fc53 100644
--- a/libc/sysdeps/linux/common/time.c
+++ b/libc/sysdeps/linux/common/time.c
@@ -16,7 +16,7 @@
 #ifdef __NR_time
 _syscall1(time_t, time, time_t *, t)
 #else
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 time_t time(time_t * t)
 {
diff --git a/libc/sysdeps/linux/common/utime.c b/libc/sysdeps/linux/common/utime.c
index fd528bd1d..5c4207aaa 100644
--- a/libc/sysdeps/linux/common/utime.c
+++ b/libc/sysdeps/linux/common/utime.c
@@ -19,7 +19,7 @@ _syscall2(int, utime, const char *, file, const struct utimbuf *, times)
 #include <sys/time.h>
 
 libc_hidden_proto(utimes)
-libc_hidden_proto(gettimeofday)
+/* libc_hidden_proto(gettimeofday) */
 
 int utime(const char *file, const struct utimbuf *times)
 {
diff --git a/libc/sysdeps/linux/common/write.c b/libc/sysdeps/linux/common/write.c
index f280d909e..7776ec955 100644
--- a/libc/sysdeps/linux/common/write.c
+++ b/libc/sysdeps/linux/common/write.c
@@ -13,7 +13,7 @@
 extern __typeof(write) __libc_write;
 #define __NR___libc_write __NR_write
 _syscall3(ssize_t, __libc_write, int, fd, const __ptr_t, buf, size_t, count)
-libc_hidden_proto(write)
+/* libc_hidden_proto(write) */
 weak_alias(__libc_write,write)
 libc_hidden_weak(write)
 #if 0
diff --git a/libc/sysdeps/linux/cris/brk.c b/libc/sysdeps/linux/cris/brk.c
index ae99e109c..f58773880 100644
--- a/libc/sysdeps/linux/cris/brk.c
+++ b/libc/sysdeps/linux/cris/brk.c
@@ -12,7 +12,7 @@
 extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
 	if (__init_brk () == 0) {
diff --git a/libc/sysdeps/linux/cris/sbrk.c b/libc/sysdeps/linux/cris/sbrk.c
index 830d01dd6..f9b55be7a 100644
--- a/libc/sysdeps/linux/cris/sbrk.c
+++ b/libc/sysdeps/linux/cris/sbrk.c
@@ -13,7 +13,7 @@
 extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/e1/longjmp.c b/libc/sysdeps/linux/e1/longjmp.c
index 9f04e7b5c..bd1b82976 100644
--- a/libc/sysdeps/linux/e1/longjmp.c
+++ b/libc/sysdeps/linux/e1/longjmp.c
@@ -43,7 +43,7 @@ void longjmp(jmp_buf state, int value )
 #undef _state_
 }
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 void siglongjmp(sigjmp_buf state, int value )
 {
diff --git a/libc/sysdeps/linux/e1/setjmp.c b/libc/sysdeps/linux/e1/setjmp.c
index bda18b13a..2d2edec5d 100644
--- a/libc/sysdeps/linux/e1/setjmp.c
+++ b/libc/sysdeps/linux/e1/setjmp.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <signal.h>
 
-libc_hidden_proto(sigprocmask)
+/* libc_hidden_proto(sigprocmask) */
 
 int setjmp( jmp_buf state)
 {
diff --git a/libc/sysdeps/linux/frv/brk.c b/libc/sysdeps/linux/frv/brk.c
index c69c97ad6..cac45bae2 100644
--- a/libc/sysdeps/linux/frv/brk.c
+++ b/libc/sysdeps/linux/frv/brk.c
@@ -13,7 +13,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/frv/fstat.c b/libc/sysdeps/linux/frv/fstat.c
index 0153ebe8e..c6aceb62f 100644
--- a/libc/sysdeps/linux/frv/fstat.c
+++ b/libc/sysdeps/linux/frv/fstat.c
@@ -13,6 +13,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(fstat)
+/* libc_hidden_proto(fstat) */
 _syscall2(int, fstat, int, fd, struct stat *, buf)
 libc_hidden_def(fstat)
diff --git a/libc/sysdeps/linux/frv/lstat.c b/libc/sysdeps/linux/frv/lstat.c
index f2c7789fa..ad87db6fc 100644
--- a/libc/sysdeps/linux/frv/lstat.c
+++ b/libc/sysdeps/linux/frv/lstat.c
@@ -13,6 +13,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(lstat)
+/* libc_hidden_proto(lstat) */
 _syscall2(int, lstat, const char *, file_name, struct stat *, buf)
 libc_hidden_def(lstat)
diff --git a/libc/sysdeps/linux/frv/mmap.c b/libc/sysdeps/linux/frv/mmap.c
index 7095bd24a..360b102a1 100644
--- a/libc/sysdeps/linux/frv/mmap.c
+++ b/libc/sysdeps/linux/frv/mmap.c
@@ -29,7 +29,7 @@
 #include <sys/syscall.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #define __NR___syscall_mmap2	    __NR_mmap2
 static __inline__ _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr,
diff --git a/libc/sysdeps/linux/frv/sbrk.c b/libc/sysdeps/linux/frv/sbrk.c
index a1ff2a148..616b81318 100644
--- a/libc/sysdeps/linux/frv/sbrk.c
+++ b/libc/sysdeps/linux/frv/sbrk.c
@@ -8,7 +8,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/frv/stat.c b/libc/sysdeps/linux/frv/stat.c
index ea9592f7a..611bddf61 100644
--- a/libc/sysdeps/linux/frv/stat.c
+++ b/libc/sysdeps/linux/frv/stat.c
@@ -13,6 +13,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-libc_hidden_proto(stat)
+/* libc_hidden_proto(stat) */
 _syscall2(int, stat, const char *, file_name, struct stat *, buf)
 libc_hidden_def(stat)
diff --git a/libc/sysdeps/linux/h8300/brk.c b/libc/sysdeps/linux/h8300/brk.c
index 9eab66060..44c867417 100644
--- a/libc/sysdeps/linux/h8300/brk.c
+++ b/libc/sysdeps/linux/h8300/brk.c
@@ -12,7 +12,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/hppa/brk.c b/libc/sysdeps/linux/hppa/brk.c
index dab2d57ca..6b9604856 100644
--- a/libc/sysdeps/linux/hppa/brk.c
+++ b/libc/sysdeps/linux/hppa/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/hppa/mmap.c b/libc/sysdeps/linux/hppa/mmap.c
index faaaab9bd..9c5077acb 100644
--- a/libc/sysdeps/linux/hppa/mmap.c
+++ b/libc/sysdeps/linux/hppa/mmap.c
@@ -13,7 +13,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 _syscall6(void *, mmap, void *, start, size_t, length, int, prot,
           int, flags, int, fd, off_t, offset)
diff --git a/libc/sysdeps/linux/i386/brk.c b/libc/sysdeps/linux/i386/brk.c
index eda8ad9ce..2be9c1802 100644
--- a/libc/sysdeps/linux/i386/brk.c
+++ b/libc/sysdeps/linux/i386/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *__unbounded newbrk, *__unbounded scratch;
diff --git a/libc/sysdeps/linux/i386/sigaction.c b/libc/sysdeps/linux/i386/sigaction.c
index 79eb6fde3..32c8f64bc 100644
--- a/libc/sysdeps/linux/i386/sigaction.c
+++ b/libc/sysdeps/linux/i386/sigaction.c
@@ -124,7 +124,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/m68k/brk.c b/libc/sysdeps/linux/m68k/brk.c
index 7daf1bd76..f04a4ab91 100644
--- a/libc/sysdeps/linux/m68k/brk.c
+++ b/libc/sysdeps/linux/m68k/brk.c
@@ -9,7 +9,7 @@
 #include <sys/syscall.h>
 #include <errno.h>
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 
 /* This must be initialized data because commons can't have aliases.  */
 void * __curbrk = 0;
diff --git a/libc/sysdeps/linux/microblaze/mmap.c b/libc/sysdeps/linux/microblaze/mmap.c
index 9cb43b487..be780eba3 100644
--- a/libc/sysdeps/linux/microblaze/mmap.c
+++ b/libc/sysdeps/linux/microblaze/mmap.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 _syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot,
 	   int, flags, int, fd, __off_t, offset)
diff --git a/libc/sysdeps/linux/mips/brk.c b/libc/sysdeps/linux/mips/brk.c
index 36620b210..e1c682902 100644
--- a/libc/sysdeps/linux/mips/brk.c
+++ b/libc/sysdeps/linux/mips/brk.c
@@ -23,7 +23,7 @@
 
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
   void *newbrk;
diff --git a/libc/sysdeps/linux/mips/mmap.c b/libc/sysdeps/linux/mips/mmap.c
index 039d5ed01..ff923cf63 100644
--- a/libc/sysdeps/linux/mips/mmap.c
+++ b/libc/sysdeps/linux/mips/mmap.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #if 0
 /* For now, leave mmap using mmap1 since mmap2 seems
diff --git a/libc/sysdeps/linux/mips/sigaction.c b/libc/sysdeps/linux/mips/sigaction.c
index 39d38b86f..edd265438 100644
--- a/libc/sysdeps/linux/mips/sigaction.c
+++ b/libc/sysdeps/linux/mips/sigaction.c
@@ -125,7 +125,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/nios/brk.c b/libc/sysdeps/linux/nios/brk.c
index ea2e45765..fb4ea94b6 100644
--- a/libc/sysdeps/linux/nios/brk.c
+++ b/libc/sysdeps/linux/nios/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/nios2/brk.c b/libc/sysdeps/linux/nios2/brk.c
index 0420798bc..6f69932a3 100644
--- a/libc/sysdeps/linux/nios2/brk.c
+++ b/libc/sysdeps/linux/nios2/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/powerpc/ioctl.c b/libc/sysdeps/linux/powerpc/ioctl.c
index e12362783..fe3a2eb20 100644
--- a/libc/sysdeps/linux/powerpc/ioctl.c
+++ b/libc/sysdeps/linux/powerpc/ioctl.c
@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(ioctl)
+/* libc_hidden_proto(ioctl) */
 
 libc_hidden_proto(tcsetattr)
 libc_hidden_proto(tcgetattr)
diff --git a/libc/sysdeps/linux/powerpc/pread_write.c b/libc/sysdeps/linux/powerpc/pread_write.c
index b3175ec8b..5850e3b64 100644
--- a/libc/sysdeps/linux/powerpc/pread_write.c
+++ b/libc/sysdeps/linux/powerpc/pread_write.c
@@ -68,9 +68,9 @@ weak_alias(__libc_pwrite64,pwrite64)
 
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)
diff --git a/libc/sysdeps/linux/sh/brk.c b/libc/sysdeps/linux/sh/brk.c
index c69c97ad6..cac45bae2 100644
--- a/libc/sysdeps/linux/sh/brk.c
+++ b/libc/sysdeps/linux/sh/brk.c
@@ -13,7 +13,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/sh/mmap.c b/libc/sysdeps/linux/sh/mmap.c
index 56566ea50..2d77a5d98 100644
--- a/libc/sysdeps/linux/sh/mmap.c
+++ b/libc/sysdeps/linux/sh/mmap.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 #ifdef HIOS
 # define __SH_SYSCALL6_TRAPA 0x2E
diff --git a/libc/sysdeps/linux/sh/sbrk.c b/libc/sysdeps/linux/sh/sbrk.c
index a1ff2a148..616b81318 100644
--- a/libc/sysdeps/linux/sh/sbrk.c
+++ b/libc/sysdeps/linux/sh/sbrk.c
@@ -8,7 +8,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/sh64/brk.c b/libc/sysdeps/linux/sh64/brk.c
index c69c97ad6..cac45bae2 100644
--- a/libc/sysdeps/linux/sh64/brk.c
+++ b/libc/sysdeps/linux/sh64/brk.c
@@ -13,7 +13,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk(void * end_data_seg)
 {
     if (__init_brk () == 0)
diff --git a/libc/sysdeps/linux/sh64/sbrk.c b/libc/sysdeps/linux/sh64/sbrk.c
index a1ff2a148..616b81318 100644
--- a/libc/sysdeps/linux/sh64/sbrk.c
+++ b/libc/sysdeps/linux/sh64/sbrk.c
@@ -8,7 +8,7 @@ extern void * __curbrk attribute_hidden;
 extern int __init_brk (void) attribute_hidden;
 extern void *_brk(void *ptr) attribute_hidden;
 
-libc_hidden_proto(sbrk)
+/* libc_hidden_proto(sbrk) */
 void *
 sbrk(intptr_t increment)
 {
diff --git a/libc/sysdeps/linux/sparc/brk.c b/libc/sysdeps/linux/sparc/brk.c
index 53f2c9c1d..37415d49d 100644
--- a/libc/sysdeps/linux/sparc/brk.c
+++ b/libc/sysdeps/linux/sparc/brk.c
@@ -25,7 +25,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
     void *newbrk;
diff --git a/libc/sysdeps/linux/v850/mmap.c b/libc/sysdeps/linux/v850/mmap.c
index ca5eddd17..7732b07f3 100644
--- a/libc/sysdeps/linux/v850/mmap.c
+++ b/libc/sysdeps/linux/v850/mmap.c
@@ -10,7 +10,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 _syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot,
 	   int, flags, int, fd, __off_t, offset)
diff --git a/libc/sysdeps/linux/vax/brk.c b/libc/sysdeps/linux/vax/brk.c
index 47fd3e529..53652f922 100644
--- a/libc/sysdeps/linux/vax/brk.c
+++ b/libc/sysdeps/linux/vax/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = NULL;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/vax/mmap.c b/libc/sysdeps/linux/vax/mmap.c
index 28e4077ef..2df685c21 100644
--- a/libc/sysdeps/linux/vax/mmap.c
+++ b/libc/sysdeps/linux/vax/mmap.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 _syscall6 (void *, mmap, void *, start, size_t, length, int, prot, int, flags,
 		int, fd, off_t, offset)
 libc_hidden_def(mmap)
diff --git a/libc/sysdeps/linux/x86_64/brk.c b/libc/sysdeps/linux/x86_64/brk.c
index eddfd9830..fc906abc1 100644
--- a/libc/sysdeps/linux/x86_64/brk.c
+++ b/libc/sysdeps/linux/x86_64/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int brk (void *addr)
 {
 	void *__unbounded newbrk;
diff --git a/libc/sysdeps/linux/x86_64/mmap.c b/libc/sysdeps/linux/x86_64/mmap.c
index faaaab9bd..9c5077acb 100644
--- a/libc/sysdeps/linux/x86_64/mmap.c
+++ b/libc/sysdeps/linux/x86_64/mmap.c
@@ -13,7 +13,7 @@
 #include <sys/mman.h>
 #include <sys/syscall.h>
 
-libc_hidden_proto(mmap)
+/* libc_hidden_proto(mmap) */
 
 _syscall6(void *, mmap, void *, start, size_t, length, int, prot,
           int, flags, int, fd, off_t, offset)
diff --git a/libc/sysdeps/linux/x86_64/sigaction.c b/libc/sysdeps/linux/x86_64/sigaction.c
index aa5c0d472..3d9e4ea29 100644
--- a/libc/sysdeps/linux/x86_64/sigaction.c
+++ b/libc/sysdeps/linux/x86_64/sigaction.c
@@ -120,7 +120,7 @@ __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
 #endif
 
 #ifndef LIBC_SIGACTION
-libc_hidden_proto(sigaction)
+/* libc_hidden_proto(sigaction) */
 weak_alias(__libc_sigaction,sigaction)
 libc_hidden_weak(sigaction)
 #endif
diff --git a/libc/sysdeps/linux/xtensa/brk.c b/libc/sysdeps/linux/xtensa/brk.c
index 51f610b70..b7a783f61 100644
--- a/libc/sysdeps/linux/xtensa/brk.c
+++ b/libc/sysdeps/linux/xtensa/brk.c
@@ -24,7 +24,7 @@
 /* This must be initialized data because commons can't have aliases.  */
 void *__curbrk attribute_hidden = 0;
 
-libc_hidden_proto(brk)
+/* libc_hidden_proto(brk) */
 int
 brk (void *addr)
 {
diff --git a/libc/sysdeps/linux/xtensa/pread_write.c b/libc/sysdeps/linux/xtensa/pread_write.c
index f44d97766..0b2199977 100644
--- a/libc/sysdeps/linux/xtensa/pread_write.c
+++ b/libc/sysdeps/linux/xtensa/pread_write.c
@@ -77,9 +77,9 @@ weak_alias(__libc_pwrite64,pwrite64)
 #endif /* __NR_pwrite */
 
 #if ! defined __NR_pread || ! defined __NR_pwrite
-libc_hidden_proto(read)
-libc_hidden_proto(write)
-libc_hidden_proto(lseek)
+/* libc_hidden_proto(read) */
+/* libc_hidden_proto(write) */
+/* libc_hidden_proto(lseek) */
 
 static ssize_t __fake_pread_write(int fd, void *buf,
 		size_t count, off_t offset, int do_pwrite)