Last portion of libc_hidden_proto removal.

Appears to build fine (several .configs tried)

37 files changed, 86 insertions, 86 deletions

diff --git a/libc/stdlib/__uc_malloc.c b/libc/stdlib/__uc_malloc.c
index c98bcfa18..38457596f 100644
--- a/libc/stdlib/__uc_malloc.c
+++ b/libc/stdlib/__uc_malloc.c
@@ -23,8 +23,8 @@ Cambridge, MA 02139, USA.
 #include <malloc.h>
 
 /* libc_hidden_proto(_exit) */
-libc_hidden_proto(__uc_malloc)
-libc_hidden_proto(__uc_malloc_failed)
+/* libc_hidden_proto(__uc_malloc) */
+/* libc_hidden_proto(__uc_malloc_failed) */
 
 void (*__uc_malloc_failed)(size_t size) = NULL;
 /* Seemingly superfluous assigment of NULL above prevents gas error
diff --git a/libc/stdlib/_strtod.c b/libc/stdlib/_strtod.c
index 3ceadce76..aac5b811b 100644
--- a/libc/stdlib/_strtod.c
+++ b/libc/stdlib/_strtod.c
@@ -111,12 +111,12 @@
 #include <wchar.h>
 #include <wctype.h>
 #include <bits/uClibc_uwchar.h>
-libc_hidden_proto(iswspace)
+/* libc_hidden_proto(iswspace) */
 #endif
 
 #ifdef __UCLIBC_HAS_XLOCALE__
 #include <xlocale.h>
-libc_hidden_proto(iswspace_l)
+/* libc_hidden_proto(iswspace_l) */
 #endif /* __UCLIBC_HAS_XLOCALE__ */
 
 /* Handle _STRTOD_HEXADECIMAL_FLOATS via uClibc config now. */
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index 84251664b..7291d0ea4 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -31,7 +31,7 @@ Cambridge, MA 02139, USA.  */
 /* Experimentally off - libc_hidden_proto(memset) */
 /* libc_hidden_proto(sigaction) */
 /* libc_hidden_proto(sigprocmask) */
-libc_hidden_proto(raise)
+/* libc_hidden_proto(raise) */
 /* libc_hidden_proto(_exit) */
 
 /* Our last ditch effort to commit suicide */
diff --git a/libc/stdlib/arc4random.c b/libc/stdlib/arc4random.c
index 0fab85c96..e7d69f168 100644
--- a/libc/stdlib/arc4random.c
+++ b/libc/stdlib/arc4random.c
@@ -168,7 +168,7 @@ arc4_getword(as)
 	return val;
 }
 
-libc_hidden_proto(arc4random_stir)
+/* libc_hidden_proto(arc4random_stir) */
 void
 arc4random_stir(void)
 {
diff --git a/libc/stdlib/drand48.c b/libc/stdlib/drand48.c
index f96947cb2..f0d20de61 100644
--- a/libc/stdlib/drand48.c
+++ b/libc/stdlib/drand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(erand48_r)
+/* libc_hidden_proto(erand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/drand48_r.c b/libc/stdlib/drand48_r.c
index 1000a3acb..96fb186f4 100644
--- a/libc/stdlib/drand48_r.c
+++ b/libc/stdlib/drand48_r.c
@@ -21,7 +21,7 @@
 #include <math.h>
 #include <stdlib.h>
 
-libc_hidden_proto(erand48_r)
+/* libc_hidden_proto(erand48_r) */
 
 int drand48_r (struct drand48_data *buffer, double *result)
 {
diff --git a/libc/stdlib/erand48.c b/libc/stdlib/erand48.c
index 853c2c35a..913d6ed84 100644
--- a/libc/stdlib/erand48.c
+++ b/libc/stdlib/erand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(erand48_r)
+/* libc_hidden_proto(erand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/erand48_r.c b/libc/stdlib/erand48_r.c
index 42db6f74b..f367f8dc6 100644
--- a/libc/stdlib/erand48_r.c
+++ b/libc/stdlib/erand48_r.c
@@ -24,7 +24,7 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-libc_hidden_proto(erand48_r)
+/* libc_hidden_proto(erand48_r) */
 int erand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, double *result)
 {
     union ieee754_double temp;
diff --git a/libc/stdlib/jrand48.c b/libc/stdlib/jrand48.c
index 6f812068b..7bfc9d608 100644
--- a/libc/stdlib/jrand48.c
+++ b/libc/stdlib/jrand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(jrand48_r)
+/* libc_hidden_proto(jrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/jrand48_r.c b/libc/stdlib/jrand48_r.c
index fe77c3c38..da2a1506d 100644
--- a/libc/stdlib/jrand48_r.c
+++ b/libc/stdlib/jrand48_r.c
@@ -22,7 +22,7 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-libc_hidden_proto(jrand48_r)
+/* libc_hidden_proto(jrand48_r) */
 int jrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, long int *result)
 {
     /* Compute next state.  */
diff --git a/libc/stdlib/lrand48.c b/libc/stdlib/lrand48.c
index 863951f07..33d0e91ef 100644
--- a/libc/stdlib/lrand48.c
+++ b/libc/stdlib/lrand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(nrand48_r)
+/* libc_hidden_proto(nrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/lrand48_r.c b/libc/stdlib/lrand48_r.c
index 277fb9ae3..c3aa89a24 100644
--- a/libc/stdlib/lrand48_r.c
+++ b/libc/stdlib/lrand48_r.c
@@ -19,9 +19,9 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(nrand48_r)
+/* libc_hidden_proto(nrand48_r) */
 
-libc_hidden_proto(lrand48_r)
+/* libc_hidden_proto(lrand48_r) */
 int lrand48_r (struct drand48_data *buffer, long int *result)
 {
     /* Be generous for the arguments, detect some errors.  */
diff --git a/libc/stdlib/malloc-simple/alloc.c b/libc/stdlib/malloc-simple/alloc.c
index c8aa1f497..e729494e0 100644
--- a/libc/stdlib/malloc-simple/alloc.c
+++ b/libc/stdlib/malloc-simple/alloc.c
@@ -20,7 +20,7 @@
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /*libc_hidden_proto(memset)*/
 /* libc_hidden_proto(mmap) */
-libc_hidden_proto(munmap)
+/* libc_hidden_proto(munmap) */
 
 #ifdef L_malloc
 void *malloc(size_t size)
diff --git a/libc/stdlib/malloc-standard/free.c b/libc/stdlib/malloc-standard/free.c
index 4d24697be..9fbf563ab 100644
--- a/libc/stdlib/malloc-standard/free.c
+++ b/libc/stdlib/malloc-standard/free.c
@@ -16,7 +16,7 @@
 
 #include "malloc.h"
 
-libc_hidden_proto(munmap)
+/* libc_hidden_proto(munmap) */
 
 /* ------------------------- __malloc_trim -------------------------
    __malloc_trim is an inverse of sorts to __malloc_alloc.  It gives memory
diff --git a/libc/stdlib/malloc-standard/mallinfo.c b/libc/stdlib/malloc-standard/mallinfo.c
index d3b613576..4ebbe8b49 100644
--- a/libc/stdlib/malloc-standard/mallinfo.c
+++ b/libc/stdlib/malloc-standard/mallinfo.c
@@ -19,7 +19,7 @@
 /* libc_hidden_proto(fprintf) */
 
 /* ------------------------------ mallinfo ------------------------------ */
-libc_hidden_proto(mallinfo)
+/* libc_hidden_proto(mallinfo) */
 struct mallinfo mallinfo(void)
 {
     mstate av;
diff --git a/libc/stdlib/malloc-standard/malloc.h b/libc/stdlib/malloc-standard/malloc.h
index b6a9130f6..524468cbe 100644
--- a/libc/stdlib/malloc-standard/malloc.h
+++ b/libc/stdlib/malloc-standard/malloc.h
@@ -25,7 +25,7 @@
 #include <bits/uClibc_mutex.h>
 
 /* libc_hidden_proto(mmap) */
-libc_hidden_proto(sysconf)
+/* libc_hidden_proto(sysconf) */
 /* libc_hidden_proto(sbrk) */
 /* libc_hidden_proto(abort) */
 
diff --git a/libc/stdlib/malloc-standard/realloc.c b/libc/stdlib/malloc-standard/realloc.c
index 41cae43d1..95eb0d38a 100644
--- a/libc/stdlib/malloc-standard/realloc.c
+++ b/libc/stdlib/malloc-standard/realloc.c
@@ -16,7 +16,7 @@
 
 #include "malloc.h"
 
-libc_hidden_proto(mremap)
+/* libc_hidden_proto(mremap) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* ------------------------------ realloc ------------------------------ */
diff --git a/libc/stdlib/malloc/free.c b/libc/stdlib/malloc/free.c
index 95b7abcbe..5dd3a7625 100644
--- a/libc/stdlib/malloc/free.c
+++ b/libc/stdlib/malloc/free.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(munmap)
+/* libc_hidden_proto(munmap) */
 /* libc_hidden_proto(sbrk) */
 
 #include "malloc.h"
diff --git a/libc/stdlib/malloc/malloc_debug.c b/libc/stdlib/malloc/malloc_debug.c
index c19059b43..01f9bfd6f 100644
--- a/libc/stdlib/malloc/malloc_debug.c
+++ b/libc/stdlib/malloc/malloc_debug.c
@@ -16,9 +16,9 @@
 #include <unistd.h>
 #include <stdarg.h>
 
-libc_hidden_proto(atoi)
+/* libc_hidden_proto(atoi) */
 /* libc_hidden_proto(vfprintf) */
-libc_hidden_proto(putc)
+/* libc_hidden_proto(putc) */
 /* libc_hidden_proto(getenv) */
 
 #include "malloc.h"
diff --git a/libc/stdlib/mrand48.c b/libc/stdlib/mrand48.c
index 6905545bd..131c4b991 100644
--- a/libc/stdlib/mrand48.c
+++ b/libc/stdlib/mrand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(jrand48_r)
+/* libc_hidden_proto(jrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/mrand48_r.c b/libc/stdlib/mrand48_r.c
index ca2bd7bbb..0127fddb5 100644
--- a/libc/stdlib/mrand48_r.c
+++ b/libc/stdlib/mrand48_r.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(jrand48_r)
+/* libc_hidden_proto(jrand48_r) */
 
 int mrand48_r (struct drand48_data *buffer, long int *result)
 {
diff --git a/libc/stdlib/nrand48.c b/libc/stdlib/nrand48.c
index 0199a30a5..e69afd78b 100644
--- a/libc/stdlib/nrand48.c
+++ b/libc/stdlib/nrand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(nrand48_r)
+/* libc_hidden_proto(nrand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/nrand48_r.c b/libc/stdlib/nrand48_r.c
index 63b0ac8ef..acf813e9b 100644
--- a/libc/stdlib/nrand48_r.c
+++ b/libc/stdlib/nrand48_r.c
@@ -22,7 +22,7 @@
 extern int __drand48_iterate(unsigned short xsubi[3],
 	struct drand48_data *buffer) attribute_hidden;
 
-libc_hidden_proto(nrand48_r)
+/* libc_hidden_proto(nrand48_r) */
 int nrand48_r (unsigned short int xsubi[3], struct drand48_data *buffer, long int *result)
 {
     /* Compute next state.  */
diff --git a/libc/stdlib/ptsname.c b/libc/stdlib/ptsname.c
index 4ac2fcd21..3e4a1cfe1 100644
--- a/libc/stdlib/ptsname.c
+++ b/libc/stdlib/ptsname.c
@@ -32,7 +32,7 @@
 /* Experimentally off - libc_hidden_proto(strcat) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(isatty)
+/* libc_hidden_proto(isatty) */
 /* libc_hidden_proto(ioctl) */
 /* libc_hidden_proto(fstat) */
 /* libc_hidden_proto(stat) */
@@ -68,7 +68,7 @@ extern const char __libc_ptyname2[] attribute_hidden;
 /* Store at most BUFLEN characters of the pathname of the slave pseudo
    terminal associated with the master FD is open on in BUF.
    Return 0 on success, otherwise an error number.  */
-libc_hidden_proto(ptsname_r)
+/* libc_hidden_proto(ptsname_r) */
 int ptsname_r (int fd, char *buf, size_t buflen)
 {
   int save_errno = errno;
diff --git a/libc/stdlib/rand.c b/libc/stdlib/rand.c
index 03323f501..61aaa9105 100644
--- a/libc/stdlib/rand.c
+++ b/libc/stdlib/rand.c
@@ -7,7 +7,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(random)
+/* libc_hidden_proto(random) */
 
 int rand (void)
 {
diff --git a/libc/stdlib/random.c b/libc/stdlib/random.c
index 3eb8aed8a..6d5d06e09 100644
--- a/libc/stdlib/random.c
+++ b/libc/stdlib/random.c
@@ -27,10 +27,10 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-libc_hidden_proto(random_r)
-libc_hidden_proto(srandom_r)
-libc_hidden_proto(setstate_r)
-libc_hidden_proto(initstate_r)
+/* libc_hidden_proto(random_r) */
+/* libc_hidden_proto(srandom_r) */
+/* libc_hidden_proto(setstate_r) */
+/* libc_hidden_proto(initstate_r) */
 
 /* POSIX.1c requires that there is mutual exclusion for the `rand' and
    `srand' functions to prevent concurrent calls from modifying common
@@ -244,7 +244,7 @@ char * setstate (char *arg_state)
    rear pointers can't wrap on the same call by not testing the rear
    pointer if the front one has wrapped.  Returns a 31-bit random number.  */
 
-libc_hidden_proto(random)
+/* libc_hidden_proto(random) */
 long int random (void)
 {
   int32_t retval;
diff --git a/libc/stdlib/random_r.c b/libc/stdlib/random_r.c
index ca80a7808..b6ff6afd2 100644
--- a/libc/stdlib/random_r.c
+++ b/libc/stdlib/random_r.c
@@ -133,7 +133,7 @@ static const struct random_poly_info random_poly_info =
    rear pointers can't wrap on the same call by not testing the rear
    pointer if the front one has wrapped.  Returns a 31-bit random number.  */
 
-libc_hidden_proto(random_r)
+/* libc_hidden_proto(random_r) */
 int random_r(struct random_data *buf, int32_t *result)
 {
     int32_t *state;
@@ -191,7 +191,7 @@ libc_hidden_def(random_r)
    information a given number of times to get rid of any initial dependencies
    introduced by the L.C.R.N.G.  Note that the initialization of randtbl[]
    for default usage relies on values produced by this routine.  */
-libc_hidden_proto(srandom_r)
+/* libc_hidden_proto(srandom_r) */
 int srandom_r (unsigned int seed, struct random_data *buf)
 {
     int type;
@@ -259,7 +259,7 @@ libc_hidden_def(srandom_r)
    Note: The first thing we do is save the current state, if any, just like
    setstate so that it doesn't matter when initstate is called.
    Returns a pointer to the old state.  */
-libc_hidden_proto(initstate_r)
+/* libc_hidden_proto(initstate_r) */
 int initstate_r (unsigned int seed, char *arg_state, size_t n, struct random_data *buf)
 {
     int type;
@@ -318,7 +318,7 @@ libc_hidden_def(initstate_r)
    to the order in which things are done, it is OK to call setstate with the
    same state as the current state
    Returns a pointer to the old state information.  */
-libc_hidden_proto(setstate_r)
+/* libc_hidden_proto(setstate_r) */
 int setstate_r (char *arg_state, struct random_data *buf)
 {
     int32_t *new_state = 1 + (int32_t *) arg_state;
diff --git a/libc/stdlib/realpath.c b/libc/stdlib/realpath.c
index e9eabdfaa..3a4789152 100644
--- a/libc/stdlib/realpath.c
+++ b/libc/stdlib/realpath.c
@@ -24,8 +24,8 @@
 /* Experimentally off - libc_hidden_proto(strcat) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(readlink)
-libc_hidden_proto(getcwd)
+/* libc_hidden_proto(readlink) */
+/* libc_hidden_proto(getcwd) */
 
 #ifndef PATH_MAX
 #ifdef _POSIX_VERSION
diff --git a/libc/stdlib/seed48.c b/libc/stdlib/seed48.c
index f068b980d..c688c1aa6 100644
--- a/libc/stdlib/seed48.c
+++ b/libc/stdlib/seed48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(seed48_r)
+/* libc_hidden_proto(seed48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/seed48_r.c b/libc/stdlib/seed48_r.c
index 3769e0fa7..4347383f8 100644
--- a/libc/stdlib/seed48_r.c
+++ b/libc/stdlib/seed48_r.c
@@ -23,7 +23,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
-libc_hidden_proto(seed48_r)
+/* libc_hidden_proto(seed48_r) */
 int seed48_r (unsigned short int seed16v[3], struct drand48_data *buffer)
 {
     /* Save old value at a private place to be used as return value.  */
diff --git a/libc/stdlib/setenv.c b/libc/stdlib/setenv.c
index 833bd8fcd..cf10804ec 100644
--- a/libc/stdlib/setenv.c
+++ b/libc/stdlib/setenv.c
@@ -30,7 +30,7 @@
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strncmp) */
 /* Experimentally off - libc_hidden_proto(strndup) */
-libc_hidden_proto(unsetenv)
+/* libc_hidden_proto(unsetenv) */
 
 #include <bits/uClibc_mutex.h>
 __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER);
@@ -133,14 +133,14 @@ int __add_to_environ (const char *name, const char *value,
     return rv;
 }
 
-libc_hidden_proto(setenv)
+/* libc_hidden_proto(setenv) */
 int setenv (const char *name, const char *value, int replace)
 {
     return __add_to_environ (name, value, NULL, replace);
 }
 libc_hidden_def(setenv)
 
-libc_hidden_proto(unsetenv)
+/* libc_hidden_proto(unsetenv) */
 int unsetenv (const char *name)
 {
     size_t len;
diff --git a/libc/stdlib/srand48.c b/libc/stdlib/srand48.c
index 42e90c9f9..5f593223a 100644
--- a/libc/stdlib/srand48.c
+++ b/libc/stdlib/srand48.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-libc_hidden_proto(srand48_r)
+/* libc_hidden_proto(srand48_r) */
 
 /* Global state for non-reentrant functions.  Defined in drand48-iter.c.  */
 extern struct drand48_data __libc_drand48_data attribute_hidden;
diff --git a/libc/stdlib/srand48_r.c b/libc/stdlib/srand48_r.c
index 45bb75f11..33c241560 100644
--- a/libc/stdlib/srand48_r.c
+++ b/libc/stdlib/srand48_r.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <limits.h>
 
-libc_hidden_proto(srand48_r)
+/* libc_hidden_proto(srand48_r) */
 int srand48_r (long int seedval, struct drand48_data *buffer)
 {
     /* The standards say we only have 32 bits.  */
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c
index aa55d12d6..7202182d9 100644
--- a/libc/stdlib/stdlib.c
+++ b/libc/stdlib/stdlib.c
@@ -197,7 +197,7 @@ _stdlib_wcsto_ll(register const wchar_t * __restrict str,
 /**********************************************************************/
 #ifdef L_atof
 
-libc_hidden_proto(strtod)
+/* libc_hidden_proto(strtod) */
 
 double atof(const char *nptr)
 {
@@ -269,9 +269,9 @@ strong_alias(llabs,imaxabs)
 
 #if INT_MAX < LONG_MAX
 
-libc_hidden_proto(strtol)
+/* libc_hidden_proto(strtol) */
 
-libc_hidden_proto(atoi)
+/* libc_hidden_proto(atoi) */
 int atoi(const char *nptr)
 {
 	return (int) strtol(nptr, (char **) NULL, 10);
@@ -284,9 +284,9 @@ libc_hidden_def(atoi)
 /**********************************************************************/
 #ifdef L_atol
 
-libc_hidden_proto(strtol)
+/* libc_hidden_proto(strtol) */
 
-libc_hidden_proto(atol)
+/* libc_hidden_proto(atol) */
 long atol(const char *nptr)
 {
 	return strtol(nptr, (char **) NULL, 10);
@@ -313,7 +313,7 @@ strong_alias(atol,atoll)
 
 #if defined(ULLONG_MAX) && (LLONG_MAX > LONG_MAX)
 
-libc_hidden_proto(strtoll)
+/* libc_hidden_proto(strtoll) */
 
 long long atoll(const char *nptr)
 {
@@ -465,10 +465,10 @@ strong_alias(strtoull,strtouq)
 #define Wuchar __uwchar_t
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) iswspace_l((C), locale_arg)
-libc_hidden_proto(iswspace_l)
+/* libc_hidden_proto(iswspace_l) */
 #else
 #define ISSPACE(C) iswspace((C))
-libc_hidden_proto(iswspace)
+/* libc_hidden_proto(iswspace) */
 #endif
 
 #else  /* defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) */
@@ -477,10 +477,10 @@ libc_hidden_proto(iswspace)
 #define Wuchar unsigned char
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) isspace_l((C), locale_arg)
-libc_hidden_proto(isspace_l)
+/* libc_hidden_proto(isspace_l) */
 #else
 #define ISSPACE(C) isspace((C))
-libc_hidden_proto(isspace)
+/* libc_hidden_proto(isspace) */
 #endif
 
 #endif /* defined(L__stdlib_wcsto_l) || defined(L__stdlib_wcsto_l_l) */
@@ -620,10 +620,10 @@ unsigned long attribute_hidden __XL_NPP(_stdlib_strto_l)(register const Wchar *
 #define Wuchar __uwchar_t
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) iswspace_l((C), locale_arg)
-libc_hidden_proto(iswspace_l)
+/* libc_hidden_proto(iswspace_l) */
 #else
 #define ISSPACE(C) iswspace((C))
-libc_hidden_proto(iswspace)
+/* libc_hidden_proto(iswspace) */
 #endif
 
 #else  /* defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) */
@@ -632,10 +632,10 @@ libc_hidden_proto(iswspace)
 #define Wuchar unsigned char
 #ifdef __UCLIBC_DO_XLOCALE
 #define ISSPACE(C) isspace_l((C), locale_arg)
-libc_hidden_proto(isspace_l)
+/* libc_hidden_proto(isspace_l) */
 #else
 #define ISSPACE(C) isspace((C))
-libc_hidden_proto(isspace)
+/* libc_hidden_proto(isspace) */
 #endif
 
 #endif /* defined(L__stdlib_wcsto_ll) || defined(L__stdlib_wcsto_ll_l) */
@@ -816,7 +816,7 @@ void *bsearch(const void *key, const void *base, size_t /* nmemb */ high,
  * calculation, as well as to reduce the generated code size with
  * bcc and gcc. */
 
-libc_hidden_proto(qsort)
+/* libc_hidden_proto(qsort) */
 void qsort(void  *base,
            size_t nel,
            size_t width,
@@ -912,7 +912,7 @@ void ssort(void  *base,
 /**********************************************************************/
 #ifdef L__stdlib_mb_cur_max
 
-libc_hidden_proto(_stdlib_mb_cur_max)
+/* libc_hidden_proto(_stdlib_mb_cur_max) */
 size_t _stdlib_mb_cur_max(void)
 {
 #ifdef __CTYPE_HAS_UTF_8_LOCALES
@@ -956,7 +956,7 @@ static __always_inline int is_stateful(unsigned char encoding)
 /**********************************************************************/
 #ifdef L_mblen
 
-libc_hidden_proto(mbrlen)
+/* libc_hidden_proto(mbrlen) */
 
 int mblen(register const char *s, size_t n)
 {
@@ -988,7 +988,7 @@ int mblen(register const char *s, size_t n)
 /**********************************************************************/
 #ifdef L_mbtowc
 
-libc_hidden_proto(mbrtowc)
+/* libc_hidden_proto(mbrtowc) */
 
 int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n)
 {
@@ -1023,7 +1023,7 @@ int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n)
 
 /* Note: We completely ignore state in all currently supported conversions. */
 
-libc_hidden_proto(wcrtomb)
+/* libc_hidden_proto(wcrtomb) */
 
 int wctomb(register char *__restrict s, wchar_t swc)
 {
@@ -1042,7 +1042,7 @@ int wctomb(register char *__restrict s, wchar_t swc)
 /**********************************************************************/
 #ifdef L_mbstowcs
 
-libc_hidden_proto(mbsrtowcs)
+/* libc_hidden_proto(mbsrtowcs) */
 
 size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 {
@@ -1059,7 +1059,7 @@ size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
 
 /* Note: We completely ignore state in all currently supported conversions. */
 
-libc_hidden_proto(wcsrtombs)
+/* libc_hidden_proto(wcsrtombs) */
 
 size_t wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
 {
diff --git a/libc/stdlib/system.c b/libc/stdlib/system.c
index 33091da0a..9244892ab 100644
--- a/libc/stdlib/system.c
+++ b/libc/stdlib/system.c
@@ -12,16 +12,16 @@
 #include <stdlib.h>
 
 /* libc_hidden_proto(_exit) */
-libc_hidden_proto(wait4)
-libc_hidden_proto(execl)
-libc_hidden_proto(signal)
-libc_hidden_proto(vfork)
+/* libc_hidden_proto(wait4) */
+/* libc_hidden_proto(execl) */
+/* libc_hidden_proto(signal) */
+/* libc_hidden_proto(vfork) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
 #ifndef __NR_vfork
 # define vfork fork
-libc_hidden_proto(fork)
+/* libc_hidden_proto(fork) */
 #endif
 
 extern __typeof(system) __libc_system;
diff --git a/libc/stdlib/unix_grantpt.c b/libc/stdlib/unix_grantpt.c
index 5d62846ef..25c335239 100644
--- a/libc/stdlib/unix_grantpt.c
+++ b/libc/stdlib/unix_grantpt.c
@@ -31,18 +31,18 @@
 #include "pty-private.h"
 
 /* Experimentally off - libc_hidden_proto(memchr) */
-libc_hidden_proto(getgid)
-libc_hidden_proto(getuid)
-libc_hidden_proto(setrlimit)
-libc_hidden_proto(waitpid)
-libc_hidden_proto(dup2)
-libc_hidden_proto(chmod)
-libc_hidden_proto(chown)
-libc_hidden_proto(vfork)
-libc_hidden_proto(fork)
+/* libc_hidden_proto(getgid) */
+/* libc_hidden_proto(getuid) */
+/* libc_hidden_proto(setrlimit) */
+/* libc_hidden_proto(waitpid) */
+/* libc_hidden_proto(dup2) */
+/* libc_hidden_proto(chmod) */
+/* libc_hidden_proto(chown) */
+/* libc_hidden_proto(vfork) */
+/* libc_hidden_proto(fork) */
 /* libc_hidden_proto(stat) */
-libc_hidden_proto(ptsname_r)
-libc_hidden_proto(execle)
+/* libc_hidden_proto(ptsname_r) */
+/* libc_hidden_proto(execle) */
 /* libc_hidden_proto(_exit) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
diff --git a/libc/stdlib/valloc.c b/libc/stdlib/valloc.c
index 13dbe0f67..d2aca4072 100644
--- a/libc/stdlib/valloc.c
+++ b/libc/stdlib/valloc.c
@@ -24,7 +24,7 @@ Cambridge, MA 02139, USA.
 #include <unistd.h>
 #include <malloc.h>
 
-libc_hidden_proto(getpagesize)
+/* libc_hidden_proto(getpagesize) */
 
 static size_t pagesize;