Last portion of libc_hidden_proto removal.

Appears to build fine (several .configs tried)

63 files changed, 143 insertions, 143 deletions

diff --git a/libc/stdio/__fsetlocking.c b/libc/stdio/__fsetlocking.c
index 2e8710076..2011cc78c 100644
--- a/libc/stdio/__fsetlocking.c
+++ b/libc/stdio/__fsetlocking.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
-libc_hidden_proto(__fsetlocking)
+/* libc_hidden_proto(__fsetlocking) */
 
 /* Not threadsafe. */
 
diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c
index 3cca7b9af..69a04bcc8 100644
--- a/libc/stdio/_cs_funcs.c
+++ b/libc/stdio/_cs_funcs.c
@@ -11,7 +11,7 @@
 /* libc_hidden_proto(write) */
 /* libc_hidden_proto(close) */
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(lseek64)
+/* libc_hidden_proto(lseek64) */
 #else
 /* libc_hidden_proto(lseek) */
 #endif
diff --git a/libc/stdio/_flushlbf.c b/libc/stdio/_flushlbf.c
index 8a551a746..7146e9bc9 100644
--- a/libc/stdio/_flushlbf.c
+++ b/libc/stdio/_flushlbf.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 #include <stdio_ext.h>
 
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
 /* Solaris function --
  * Flush all line buffered (writing) streams.
diff --git a/libc/stdio/_fopen.c b/libc/stdio/_fopen.c
index d3240b77b..fcbe1e4c6 100644
--- a/libc/stdio/_fopen.c
+++ b/libc/stdio/_fopen.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(isatty)
+/* libc_hidden_proto(isatty) */
 /* libc_hidden_proto(open) */
 /* libc_hidden_proto(fcntl) */
 
diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index 5b9e7008a..1a42ffbfd 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -81,22 +81,22 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(ungetc)
-libc_hidden_proto(vfscanf)
-libc_hidden_proto(vsscanf)
+/* libc_hidden_proto(ungetc) */
+/* libc_hidden_proto(vfscanf) */
+/* libc_hidden_proto(vsscanf) */
 /* libc_hidden_proto(fclose) */
-libc_hidden_proto(getc_unlocked)
-libc_hidden_proto(__fgetc_unlocked)
+/* libc_hidden_proto(getc_unlocked) */
+/* libc_hidden_proto(__fgetc_unlocked) */
 #ifdef __UCLIBC_HAS_WCHAR__
-libc_hidden_proto(wcslen)
-libc_hidden_proto(vfwscanf)
-libc_hidden_proto(vswscanf)
-libc_hidden_proto(mbsrtowcs)
-libc_hidden_proto(mbrtowc)
-libc_hidden_proto(wcrtomb)
-libc_hidden_proto(ungetwc)
-libc_hidden_proto(iswspace)
-libc_hidden_proto(fgetwc_unlocked)
+/* libc_hidden_proto(wcslen) */
+/* libc_hidden_proto(vfwscanf) */
+/* libc_hidden_proto(vswscanf) */
+/* libc_hidden_proto(mbsrtowcs) */
+/* libc_hidden_proto(mbrtowc) */
+/* libc_hidden_proto(wcrtomb) */
+/* libc_hidden_proto(ungetwc) */
+/* libc_hidden_proto(iswspace) */
+/* libc_hidden_proto(fgetwc_unlocked) */
 #endif
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_b_loc) */
@@ -165,7 +165,7 @@ _stdlib_strto_l(register const char * __restrict str,
 /**********************************************************************/
 #ifdef L_fscanf
 
-libc_hidden_proto(fscanf)
+/* libc_hidden_proto(fscanf) */
 int fscanf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -201,7 +201,7 @@ int scanf(const char * __restrict format, ...)
 
 #ifdef __STDIO_HAS_VSSCANF
 
-libc_hidden_proto(sscanf)
+/* libc_hidden_proto(sscanf) */
 int sscanf(const char * __restrict str, const char * __restrict format, ...)
 {
 	va_list arg;
@@ -223,7 +223,7 @@ libc_hidden_def(sscanf)
 /**********************************************************************/
 #ifdef L_vscanf
 
-libc_hidden_proto(vscanf)
+/* libc_hidden_proto(vscanf) */
 int vscanf(const char * __restrict format, va_list arg)
 {
 	return vfscanf(stdin, format, arg);
diff --git a/libc/stdio/_stdio.c b/libc/stdio/_stdio.c
index d8c0ae20d..52e7295cf 100644
--- a/libc/stdio/_stdio.c
+++ b/libc/stdio/_stdio.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(isatty)
+/* libc_hidden_proto(isatty) */
 
 /* This is pretty much straight from uClibc, but with one important
  * difference.
diff --git a/libc/stdio/_trans2w.c b/libc/stdio/_trans2w.c
index ed1a583fc..57a06d336 100644
--- a/libc/stdio/_trans2w.c
+++ b/libc/stdio/_trans2w.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fseek)
+/* libc_hidden_proto(fseek) */
 
 /* Function to handle transition to writing.
  *   Initialize or verify the stream's orientation (even if readonly).
diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
index 9d7f99cad..5ce3f8a59 100644
--- a/libc/stdio/_vfprintf.c
+++ b/libc/stdio/_vfprintf.c
@@ -119,17 +119,17 @@
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strlen) */
 /* Experimentally off - libc_hidden_proto(strnlen) */
-libc_hidden_proto(__glibc_strerror_r)
-libc_hidden_proto(fputs_unlocked)
+/* libc_hidden_proto(__glibc_strerror_r) */
+/* libc_hidden_proto(fputs_unlocked) */
 /* libc_hidden_proto(abort) */
 #ifdef __UCLIBC_HAS_WCHAR__
-libc_hidden_proto(wcslen)
-libc_hidden_proto(wcsnlen)
-libc_hidden_proto(mbsrtowcs)
-libc_hidden_proto(wcsrtombs)
-libc_hidden_proto(btowc)
-libc_hidden_proto(wcrtomb)
-libc_hidden_proto(fputws)
+/* libc_hidden_proto(wcslen) */
+/* libc_hidden_proto(wcsnlen) */
+/* libc_hidden_proto(mbsrtowcs) */
+/* libc_hidden_proto(wcsrtombs) */
+/* libc_hidden_proto(btowc) */
+/* libc_hidden_proto(wcrtomb) */
+/* libc_hidden_proto(fputws) */
 #endif
 
 /* Some older or broken gcc toolchains define LONG_LONG_MAX but not
diff --git a/libc/stdio/_wfwrite.c b/libc/stdio/_wfwrite.c
index fb5c6b3ee..8fa59f87d 100644
--- a/libc/stdio/_wfwrite.c
+++ b/libc/stdio/_wfwrite.c
@@ -16,8 +16,8 @@
 #warning TODO: Fix prototype.
 #endif
 
-libc_hidden_proto(wmemcpy)
-libc_hidden_proto(wcsnrtombs)
+/* libc_hidden_proto(wmemcpy) */
+/* libc_hidden_proto(wcsnrtombs) */
 
 size_t attribute_hidden _wstdio_fwrite(const wchar_t *__restrict ws, size_t n,
 					  register FILE *__restrict stream)
diff --git a/libc/stdio/asprintf.c b/libc/stdio/asprintf.c
index 3f1992559..8c6420936 100644
--- a/libc/stdio/asprintf.c
+++ b/libc/stdio/asprintf.c
@@ -11,9 +11,9 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-libc_hidden_proto(asprintf)
+/* libc_hidden_proto(asprintf) */
 
-libc_hidden_proto(vasprintf)
+/* libc_hidden_proto(vasprintf) */
 
 #ifndef __STDIO_HAS_VSNPRINTF
 #warning Skipping asprintf and __asprintf since no vsnprintf!
diff --git a/libc/stdio/dprintf.c b/libc/stdio/dprintf.c
index a8b2704b2..0123c501a 100644
--- a/libc/stdio/dprintf.c
+++ b/libc/stdio/dprintf.c
@@ -11,7 +11,7 @@
 #include "_stdio.h"
 #include <stdarg.h>
 
-libc_hidden_proto(vdprintf)
+/* libc_hidden_proto(vdprintf) */
 
 int dprintf(int filedes, const char * __restrict format, ...)
 {
diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
index eadfe74de..7d2138130 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -9,7 +9,7 @@
 /* libc_hidden_proto(fclose) */
 
 /* libc_hidden_proto(close) */
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
 int fclose(register FILE *stream)
 {
diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c
index fcd21f707..d47d6ea99 100644
--- a/libc/stdio/fdopen.c
+++ b/libc/stdio/fdopen.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fdopen)
+/* libc_hidden_proto(fdopen) */
 /* libc_hidden_proto(fcntl) */
 
 FILE *fdopen(int filedes, const char *mode)
diff --git a/libc/stdio/fflush.c b/libc/stdio/fflush.c
index e1527b3a3..cee712a92 100644
--- a/libc/stdio/fflush.c
+++ b/libc/stdio/fflush.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -179,14 +179,14 @@ int fflush_unlocked(register FILE *stream)
 libc_hidden_def(fflush_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fflush)
+/* libc_hidden_proto(fflush) */
 strong_alias(fflush_unlocked,fflush)
 libc_hidden_def(fflush)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fflush)
+/* libc_hidden_proto(fflush) */
 int fflush(register FILE *stream)
 {
 	int retval;
diff --git a/libc/stdio/fgetc.c b/libc/stdio/fgetc.c
index 7eb2b6ea2..89c8fe35a 100644
--- a/libc/stdio/fgetc.c
+++ b/libc/stdio/fgetc.c
@@ -13,11 +13,11 @@
 #undef getc
 #undef getc_unlocked
 
-libc_hidden_proto(__fgetc_unlocked)
+/* libc_hidden_proto(__fgetc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-libc_hidden_proto(fflush_unlocked)
+/* libc_hidden_proto(fflush_unlocked) */
 
 int __fgetc_unlocked(FILE *stream)
 {
@@ -75,7 +75,7 @@ int __fgetc_unlocked(FILE *stream)
 }
 libc_hidden_def(__fgetc_unlocked)
 
-libc_hidden_proto(fgetc_unlocked)
+/* libc_hidden_proto(fgetc_unlocked) */
 strong_alias(__fgetc_unlocked,fgetc_unlocked)
 libc_hidden_def(fgetc_unlocked)
 
@@ -83,12 +83,12 @@ libc_hidden_def(fgetc_unlocked)
 //strong_alias(__fgetc_unlocked,__getc_unlocked)
 //libc_hidden_def(__getc_unlocked)
 
-libc_hidden_proto(getc_unlocked)
+/* libc_hidden_proto(getc_unlocked) */
 strong_alias(__fgetc_unlocked,getc_unlocked)
 libc_hidden_def(getc_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fgetc)
+/* libc_hidden_proto(fgetc) */
 strong_alias(__fgetc_unlocked,fgetc)
 libc_hidden_def(fgetc)
 
@@ -97,7 +97,7 @@ strong_alias(__fgetc_unlocked,getc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fgetc)
+/* libc_hidden_proto(fgetc) */
 int fgetc(register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
diff --git a/libc/stdio/fgets.c b/libc/stdio/fgets.c
index 5eb1aac31..0c7b97ecd 100644
--- a/libc/stdio/fgets.c
+++ b/libc/stdio/fgets.c
@@ -7,11 +7,11 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fgets_unlocked)
+/* libc_hidden_proto(fgets_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
-libc_hidden_proto(__fgetc_unlocked)
+/* libc_hidden_proto(__fgetc_unlocked) */
 
 char *fgets_unlocked(char *__restrict s, int n,
 					   register FILE * __restrict stream)
diff --git a/libc/stdio/fgetwc.c b/libc/stdio/fgetwc.c
index 062d825d6..34327434c 100644
--- a/libc/stdio/fgetwc.c
+++ b/libc/stdio/fgetwc.c
@@ -7,9 +7,9 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fgetwc_unlocked)
+/* libc_hidden_proto(fgetwc_unlocked) */
 
-libc_hidden_proto(mbrtowc)
+/* libc_hidden_proto(mbrtowc) */
 
 #ifdef __DO_UNLOCKED
 
@@ -113,7 +113,7 @@ libc_hidden_def(fgetwc_unlocked)
 
 strong_alias(fgetwc_unlocked,getwc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fgetwc)
+/* libc_hidden_proto(fgetwc) */
 strong_alias(fgetwc_unlocked,fgetwc)
 libc_hidden_def(fgetwc)
 
@@ -122,7 +122,7 @@ strong_alias(fgetwc_unlocked,getwc)
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fgetwc)
+/* libc_hidden_proto(fgetwc) */
 wint_t fgetwc(register FILE *stream)
 {
 	wint_t retval;
diff --git a/libc/stdio/fgetws.c b/libc/stdio/fgetws.c
index c7dcc7d2b..80af1a217 100644
--- a/libc/stdio/fgetws.c
+++ b/libc/stdio/fgetws.c
@@ -7,9 +7,9 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fgetws_unlocked)
+/* libc_hidden_proto(fgetws_unlocked) */
 
-libc_hidden_proto(fgetwc_unlocked)
+/* libc_hidden_proto(fgetwc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
diff --git a/libc/stdio/fileno.c b/libc/stdio/fileno.c
index 929936bfd..faed620d8 100644
--- a/libc/stdio/fileno.c
+++ b/libc/stdio/fileno.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fileno_unlocked)
+/* libc_hidden_proto(fileno_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -25,14 +25,14 @@ int fileno_unlocked(register FILE *stream)
 libc_hidden_def(fileno_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fileno)
+/* libc_hidden_proto(fileno) */
 strong_alias(fileno_unlocked,fileno)
 libc_hidden_def(fileno)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fileno)
+/* libc_hidden_proto(fileno) */
 int fileno(register FILE *stream)
 {
 	int retval;
diff --git a/libc/stdio/fmemopen.c b/libc/stdio/fmemopen.c
index ba194d726..269c7ec6d 100644
--- a/libc/stdio/fmemopen.c
+++ b/libc/stdio/fmemopen.c
@@ -11,7 +11,7 @@
 #include "_stdio.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(fopencookie)
+/* libc_hidden_proto(fopencookie) */
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 #error no custom streams!
diff --git a/libc/stdio/fopencookie.c b/libc/stdio/fopencookie.c
index 0b7ed84b1..ac2c33483 100644
--- a/libc/stdio/fopencookie.c
+++ b/libc/stdio/fopencookie.c
@@ -31,7 +31,7 @@
 /* Currently no real reentrancy issues other than a possible double close(). */
 
 #ifndef __BCC__
-libc_hidden_proto(fopencookie)
+/* libc_hidden_proto(fopencookie) */
 FILE *fopencookie(void * __restrict cookie, const char * __restrict mode,
 				  cookie_io_functions_t io_functions)
 #else
diff --git a/libc/stdio/fputc.c b/libc/stdio/fputc.c
index ac3b23ec5..09d8ee138 100644
--- a/libc/stdio/fputc.c
+++ b/libc/stdio/fputc.c
@@ -12,7 +12,7 @@
 #undef putc
 #undef putc_unlocked
 
-libc_hidden_proto(__fputc_unlocked)
+/* libc_hidden_proto(__fputc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
@@ -78,22 +78,22 @@ strong_alias(__fputc_unlocked,fputc_unlocked)
 /* exposing these would be fundamentally *wrong*! fix you, instead! */
 /* libc_hidden_def(fputc_unlocked) */
 
-libc_hidden_proto(putc_unlocked)
+/* libc_hidden_proto(putc_unlocked) */
 strong_alias(__fputc_unlocked,putc_unlocked)
 libc_hidden_def(putc_unlocked)
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fputc)
+/* libc_hidden_proto(fputc) */
 strong_alias(__fputc_unlocked,fputc)
 libc_hidden_def(fputc)
 
-libc_hidden_proto(putc)
+/* libc_hidden_proto(putc) */
 strong_alias(__fputc_unlocked,putc)
 libc_hidden_def(putc)
 #endif
 
 #elif defined __UCLIBC_HAS_THREADS__
 
-libc_hidden_proto(fputc)
+/* libc_hidden_proto(fputc) */
 int fputc(int c, register FILE *stream)
 {
 	if (stream->__user_locking != 0) {
@@ -108,7 +108,7 @@ int fputc(int c, register FILE *stream)
 }
 libc_hidden_def(fputc)
 
-libc_hidden_proto(putc)
+/* libc_hidden_proto(putc) */
 strong_alias(fputc,putc)
 libc_hidden_def(putc)
 
diff --git a/libc/stdio/fputs.c b/libc/stdio/fputs.c
index 553fb2eb9..08da59c40 100644
--- a/libc/stdio/fputs.c
+++ b/libc/stdio/fputs.c
@@ -7,10 +7,10 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fputs_unlocked)
+/* libc_hidden_proto(fputs_unlocked) */
 
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(fwrite_unlocked)
+/* libc_hidden_proto(fwrite_unlocked) */
 
 /* Note: The standard says fputs returns a nonnegative number on
  * success.  In this implementation, we return the length of the
diff --git a/libc/stdio/fputwc.c b/libc/stdio/fputwc.c
index 240c1e9c4..6c7d6b263 100644
--- a/libc/stdio/fputwc.c
+++ b/libc/stdio/fputwc.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fputwc_unlocked)
+/* libc_hidden_proto(fputwc_unlocked) */
 
 #ifdef __DO_UNLOCKED
 
diff --git a/libc/stdio/fputws.c b/libc/stdio/fputws.c
index ecbc121dd..a4fadb428 100644
--- a/libc/stdio/fputws.c
+++ b/libc/stdio/fputws.c
@@ -7,9 +7,9 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fputws_unlocked)
+/* libc_hidden_proto(fputws_unlocked) */
 
-libc_hidden_proto(wcslen)
+/* libc_hidden_proto(wcslen) */
 
 #ifdef __DO_UNLOCKED
 
@@ -23,14 +23,14 @@ int fputws_unlocked(const wchar_t *__restrict ws,
 libc_hidden_def(fputws_unlocked)
 
 #ifndef __UCLIBC_HAS_THREADS__
-libc_hidden_proto(fputws)
+/* libc_hidden_proto(fputws) */
 strong_alias(fputws_unlocked,fputws)
 libc_hidden_def(fputws)
 #endif
 
 #elif defined