12 files changed, 19 insertions, 21 deletions
diff --git a/libc/stdio/_READ.c b/libc/stdio/_READ.c
index bafa8dffe..09fca91c7 100644
--- a/libc/stdio/_READ.c
+++ b/libc/stdio/_READ.c
@@ -8,7 +8,7 @@
 #include "_stdio.h"
 
 libc_hidden_proto(read)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 
 /* Given a reading stream without its end-of-file indicator set and
  * with no buffered input or ungots, read at most 'bufsize' bytes
diff --git a/libc/stdio/_cs_funcs.c b/libc/stdio/_cs_funcs.c
index 38a8351e5..8f83aa229 100644
--- a/libc/stdio/_cs_funcs.c
+++ b/libc/stdio/_cs_funcs.c
@@ -9,7 +9,7 @@
 
 libc_hidden_proto(read)
 libc_hidden_proto(write)
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 #ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(lseek64)
 #else
diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index cb768cffb..fbd35db24 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -84,7 +84,7 @@
 libc_hidden_proto(ungetc)
 libc_hidden_proto(vfscanf)
 libc_hidden_proto(vsscanf)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(getc_unlocked)
 libc_hidden_proto(__fgetc_unlocked)
 #ifdef __UCLIBC_HAS_WCHAR__
@@ -99,9 +99,9 @@ libc_hidden_proto(iswspace)
 libc_hidden_proto(fgetwc_unlocked)
 #endif
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 #ifdef __UCLIBC_HAS_SCANF_GLIBC_A_FLAG__
diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
index 61a730d75..9d7f99cad 100644
--- a/libc/stdio/_vfprintf.c
+++ b/libc/stdio/_vfprintf.c
@@ -121,7 +121,7 @@
 /* Experimentally off - libc_hidden_proto(strnlen) */
 libc_hidden_proto(__glibc_strerror_r)
 libc_hidden_proto(fputs_unlocked)
-libc_hidden_proto(abort)
+/* libc_hidden_proto(abort) */
 #ifdef __UCLIBC_HAS_WCHAR__
 libc_hidden_proto(wcslen)
 libc_hidden_proto(wcsnlen)
@@ -729,9 +729,9 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs)
 #ifdef L__ppfs_parsespec
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(__ctype_b_loc)
+/* libc_hidden_proto(__ctype_b_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_b)
+/* libc_hidden_proto(__ctype_b) */
 #endif
 
 /* Notes: argtype differs from glibc for the following:
@@ -1860,7 +1860,7 @@ static int _do_one_spec(FILE * __restrict stream,
 	return 0;
 }
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 
 int VFPRINTF_internal (FILE * __restrict stream,
 			  const FMT_TYPE * __restrict format,
diff --git a/libc/stdio/fclose.c b/libc/stdio/fclose.c
index 27d3c7e96..eadfe74de 100644
--- a/libc/stdio/fclose.c
+++ b/libc/stdio/fclose.c
@@ -6,9 +6,9 @@
  */
 
 #include "_stdio.h"
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(fflush_unlocked)
 
 int fclose(register FILE *stream)
diff --git a/libc/stdio/fcloseall.c b/libc/stdio/fcloseall.c
index d3cbb67f8..b13da31a1 100644
--- a/libc/stdio/fcloseall.c
+++ b/libc/stdio/fcloseall.c
@@ -10,7 +10,7 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 
 /* NOTE: GLIBC difference!!! -- fcloseall
  * According to the info pages, glibc actually fclose()s all open files.
diff --git a/libc/stdio/fprintf.c b/libc/stdio/fprintf.c
index 4f73441e1..b10340f65 100644
--- a/libc/stdio/fprintf.c
+++ b/libc/stdio/fprintf.c
@@ -10,7 +10,7 @@
 
 libc_hidden_proto(vfprintf)
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 int fprintf(FILE * __restrict stream, const char * __restrict format, ...)
 {
 	va_list arg;
diff --git a/libc/stdio/freopen.c b/libc/stdio/freopen.c
index 942a67991..d51a549b9 100644
--- a/libc/stdio/freopen.c
+++ b/libc/stdio/freopen.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 
 #ifndef __DO_LARGEFILE
 # define FILEDES_ARG    (-1)
diff --git a/libc/stdio/perror.c b/libc/stdio/perror.c
index 993fcf428..46881ea85 100644
--- a/libc/stdio/perror.c
+++ b/libc/stdio/perror.c
@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(fprintf)
+/* libc_hidden_proto(fprintf) */
 libc_hidden_proto(__glibc_strerror_r)
 
 #ifdef __UCLIBC_MJN3_ONLY__
diff --git a/libc/stdio/popen.c b/libc/stdio/popen.c
index 43d07fa0f..fc6979375 100644
--- a/libc/stdio/popen.c
+++ b/libc/stdio/popen.c
@@ -26,7 +26,7 @@
 #warning "hmm... susv3 says Pipe streams are byte-oriented."
 #endif /* __UCLIBC_MJN3_ONLY__ */
 
-libc_hidden_proto(close)
+/* libc_hidden_proto(close) */
 libc_hidden_proto(_exit)
 libc_hidden_proto(waitpid)
 libc_hidden_proto(execl)
@@ -34,7 +34,7 @@ libc_hidden_proto(dup2)
 libc_hidden_proto(fdopen)
 libc_hidden_proto(pipe)
 libc_hidden_proto(vfork)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 
 /* uClinux-2.0 has vfork, but Linux 2.0 doesn't */
 #include <sys/syscall.h>
diff --git a/libc/stdio/tmpfile.c b/libc/stdio/tmpfile.c
index f268d58cc..01724b699 100644
--- a/libc/stdio/tmpfile.c
+++ b/libc/stdio/tmpfile.c
@@ -27,9 +27,7 @@
 
 libc_hidden_proto(fdopen)
 libc_hidden_proto(remove)
-#ifndef __UCLIBC_HAS_THREADS_NATIVE__
-libc_hidden_proto(close)
-#endif
+/* libc_hidden_proto(close) */
 
 /* This returns a new stream opened on a temporary file (generated
    by tmpnam).  The file is opened with mode "w+b" (binary read/write).
diff --git a/libc/stdio/vasprintf.c b/libc/stdio/vasprintf.c
index b7e2e0852..98ca6c2a7 100644
--- a/libc/stdio/vasprintf.c
+++ b/libc/stdio/vasprintf.c
@@ -24,7 +24,7 @@
 
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
 libc_hidden_proto(open_memstream)
-libc_hidden_proto(fclose)
+/* libc_hidden_proto(fclose) */
 libc_hidden_proto(vfprintf)
 #else
 libc_hidden_proto(vsnprintf)