Last portion of libc_hidden_proto removal.

Appears to build fine (several .configs tried)

51 files changed, 269 insertions, 261 deletions

diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c
index d00cdfac9..c6132924d 100644
--- a/libc/misc/assert/__assert.c
+++ b/libc/misc/assert/__assert.c
@@ -40,7 +40,7 @@
 #include <assert.h>
 #undef assert
 
-libc_hidden_proto(__assert)
+/* libc_hidden_proto(__assert) */
 
 #define ASSERT_SHOW_PROGNAME 1
 
diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c
index 9c863e729..fe2cfb657 100644
--- a/libc/misc/ctype/ctype.c
+++ b/libc/misc/ctype/ctype.c
@@ -307,7 +307,7 @@ libc_hidden_def(tolower)
 #ifdef L_tolower_l
 
 #undef tolower_l
-libc_hidden_proto(tolower_l)
+/* libc_hidden_proto(tolower_l) */
 int tolower_l(int c, __locale_t l)
 {
 #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__)
@@ -326,7 +326,7 @@ weak_alias (tolower_l, __tolower_l)
 #ifdef __UCLIBC_HAS_XLOCALE__
 /* libc_hidden_proto(__ctype_toupper_loc) */
 #elif defined __UCLIBC_HAS_CTYPE_TABLES__
-libc_hidden_proto(__ctype_toupper)
+/* libc_hidden_proto(__ctype_toupper) */
 #endif
 /* libc_hidden_proto(toupper) */
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
@@ -354,7 +354,7 @@ libc_hidden_def(toupper)
 #ifdef L_toupper_l
 
 #undef toupper_l
-libc_hidden_proto(toupper_l)
+/* libc_hidden_proto(toupper_l) */
 int toupper_l(int c, __locale_t l)
 {
 #if defined(__UCLIBC_HAS_CTYPE_ENFORCED__)
@@ -379,7 +379,7 @@ int __XL_NPP(isascii)(int c)
 
 #else  /* __UCLIBC_HAS_CTYPE_TABLES__ */
 
-libc_hidden_proto(isascii)
+/* libc_hidden_proto(isascii) */
 int isascii(int c)
 {
 	return __isascii(c);		/* locale-independent */
@@ -468,6 +468,8 @@ libc_hidden_def(__ctype_toupper_loc)
 /**********************************************************************/
 #ifdef L___C_ctype_b
 
+//vda:TODO:make static
+
 extern const __ctype_mask_t __C_ctype_b_data[];
 libc_hidden_proto(__C_ctype_b_data)
 const __ctype_mask_t __C_ctype_b_data[] = {
@@ -875,6 +877,8 @@ libc_hidden_data_def(__ctype_b)
 /**********************************************************************/
 #ifdef L___C_ctype_tolower
 
+//vda:TODO: make static
+
 extern const __ctype_touplow_t __C_ctype_tolower_data[];
 libc_hidden_proto(__C_ctype_tolower_data)
 const __ctype_touplow_t __C_ctype_tolower_data[] = {
@@ -980,15 +984,15 @@ const __ctype_touplow_t __C_ctype_tolower_data[] = {
 libc_hidden_data_def(__C_ctype_tolower_data)
 
 /* libc_hidden_proto(__C_ctype_tolower) */
-const __ctype_touplow_t *__C_ctype_tolower = __C_ctype_tolower_data
-											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
+const __ctype_touplow_t *__C_ctype_tolower =
+		__C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__C_ctype_tolower)
 
 #ifndef __UCLIBC_HAS_XLOCALE__
 
 /* libc_hidden_proto(__ctype_tolower) */
-const __ctype_touplow_t *__ctype_tolower = __C_ctype_tolower_data
-											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
+const __ctype_touplow_t *__ctype_tolower =
+		__C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_tolower)
 
 #endif
@@ -997,6 +1001,8 @@ libc_hidden_data_def(__ctype_tolower)
 /**********************************************************************/
 #ifdef L___C_ctype_toupper
 
+//vda:TODO: make static
+
 extern const __ctype_touplow_t __C_ctype_toupper_data[];
 libc_hidden_proto(__C_ctype_toupper_data)
 const __ctype_touplow_t __C_ctype_toupper_data[] = {
@@ -1102,15 +1108,15 @@ const __ctype_touplow_t __C_ctype_toupper_data[] = {
 libc_hidden_data_def(__C_ctype_toupper_data)
 
 /* libc_hidden_proto(__C_ctype_toupper) */
-const __ctype_touplow_t *__C_ctype_toupper = __C_ctype_toupper_data
-											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
+const __ctype_touplow_t *__C_ctype_toupper =
+		__C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__C_ctype_toupper)
 
 #ifndef __UCLIBC_HAS_XLOCALE__
 
-libc_hidden_proto(__ctype_toupper)
-const __ctype_touplow_t *__ctype_toupper = __C_ctype_toupper_data
-											+ __UCLIBC_CTYPE_TO_TBL_OFFSET;
+/* libc_hidden_proto(__ctype_toupper) */
+const __ctype_touplow_t *__ctype_toupper =
+		__C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET;
 libc_hidden_data_def(__ctype_toupper)
 
 #endif
diff --git a/libc/misc/dirent/closedir.c b/libc/misc/dirent/closedir.c
index 33ef6098c..466e600ac 100644
--- a/libc/misc/dirent/closedir.c
+++ b/libc/misc/dirent/closedir.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include "dirstream.h"
 
-libc_hidden_proto(closedir)
+/* libc_hidden_proto(closedir) */
 /* libc_hidden_proto(close) */
 
 int closedir(DIR * dir)
diff --git a/libc/misc/dirent/dirfd.c b/libc/misc/dirent/dirfd.c
index c6f46e965..e5b41bc6b 100644
--- a/libc/misc/dirent/dirfd.c
+++ b/libc/misc/dirent/dirfd.c
@@ -8,7 +8,7 @@
 #include <errno.h>
 #include "dirstream.h"
 
-libc_hidden_proto(dirfd)
+/* libc_hidden_proto(dirfd) */
 
 int dirfd(DIR * dir)
 {
diff --git a/libc/misc/dirent/opendir.c b/libc/misc/dirent/opendir.c
index 4a5a562f8..50e4082da 100644
--- a/libc/misc/dirent/opendir.c
+++ b/libc/misc/dirent/opendir.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 #include "dirstream.h"
 
-libc_hidden_proto(opendir)
+/* libc_hidden_proto(opendir) */
 /* libc_hidden_proto(open) */
 /* libc_hidden_proto(fcntl) */
 /* libc_hidden_proto(close) */
diff --git a/libc/misc/dirent/readdir.c b/libc/misc/dirent/readdir.c
index 2fb7a7246..e92c4ad58 100644
--- a/libc/misc/dirent/readdir.c
+++ b/libc/misc/dirent/readdir.c
@@ -13,7 +13,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-libc_hidden_proto(readdir)
+/* libc_hidden_proto(readdir) */
 
 struct dirent *readdir(DIR * dir)
 {
diff --git a/libc/misc/dirent/readdir64.c b/libc/misc/dirent/readdir64.c
index e8a29da96..3aaef5139 100644
--- a/libc/misc/dirent/readdir64.c
+++ b/libc/misc/dirent/readdir64.c
@@ -13,7 +13,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-libc_hidden_proto(readdir64)
+/* libc_hidden_proto(readdir64) */
 struct dirent64 *readdir64(DIR * dir)
 {
 	ssize_t bytes;
diff --git a/libc/misc/dirent/readdir64_r.c b/libc/misc/dirent/readdir64_r.c
index 2958b1d1a..d394fdb8f 100644
--- a/libc/misc/dirent/readdir64_r.c
+++ b/libc/misc/dirent/readdir64_r.c
@@ -15,7 +15,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
-libc_hidden_proto(readdir64_r)
+/* libc_hidden_proto(readdir64_r) */
 int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)
 {
 	int ret;
diff --git a/libc/misc/dirent/readdir_r.c b/libc/misc/dirent/readdir_r.c
index 194af621f..51f483ba5 100644
--- a/libc/misc/dirent/readdir_r.c
+++ b/libc/misc/dirent/readdir_r.c
@@ -13,7 +13,7 @@
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
 
-libc_hidden_proto(readdir_r)
+/* libc_hidden_proto(readdir_r) */
 int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result)
 {
 	int ret;
diff --git a/libc/misc/dirent/scandir.c b/libc/misc/dirent/scandir.c
index 9b0f7385a..9f1055439 100644
--- a/libc/misc/dirent/scandir.c
+++ b/libc/misc/dirent/scandir.c
@@ -13,10 +13,10 @@
 #include "dirstream.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(closedir)
-libc_hidden_proto(qsort)
-libc_hidden_proto(readdir)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(readdir) */
 
 int scandir(const char *dir, struct dirent ***namelist,
 	int (*selector) (const struct dirent *),
diff --git a/libc/misc/dirent/scandir64.c b/libc/misc/dirent/scandir64.c
index de294c63a..bbd452d50 100644
--- a/libc/misc/dirent/scandir64.c
+++ b/libc/misc/dirent/scandir64.c
@@ -31,10 +31,10 @@
 #include "dirstream.h"
 
 /* Experimentally off - libc_hidden_proto(memcpy) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(closedir)
-libc_hidden_proto(qsort)
-libc_hidden_proto(readdir64)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(readdir64) */
 
 int scandir64(const char *dir, struct dirent64 ***namelist,
 	int (*selector) (const struct dirent64 *),
diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c
index 566410485..d30efbe37 100644
--- a/libc/misc/error/err.c
+++ b/libc/misc/error/err.c
@@ -21,14 +21,14 @@
 
 #if defined __USE_BSD
 
-libc_hidden_proto(vwarn)
-libc_hidden_proto(vwarnx)
-libc_hidden_proto(verr)
-libc_hidden_proto(verrx)
+/* libc_hidden_proto(vwarn) */
+/* libc_hidden_proto(vwarnx) */
+/* libc_hidden_proto(verr) */
+/* libc_hidden_proto(verrx) */
 
 /* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(vfprintf) */
-libc_hidden_proto(__xpg_strerror_r)
+/* libc_hidden_proto(__xpg_strerror_r) */
 /* libc_hidden_proto(exit) */
 /* libc_hidden_proto(vfprintf) */
 
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index 3cf8d34f2..7518ff5e5 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -30,11 +30,11 @@
 /* Experimentally off - libc_hidden_proto(strerror) */
 /* libc_hidden_proto(fprintf) */
 /* libc_hidden_proto(exit) */
-libc_hidden_proto(putc)
+/* libc_hidden_proto(putc) */
 /* libc_hidden_proto(vfprintf) */
-libc_hidden_proto(fflush)
-libc_hidden_proto(fputc)
-libc_hidden_proto(__fputc_unlocked)
+/* libc_hidden_proto(fflush) */
+/* libc_hidden_proto(fputc) */
+/* libc_hidden_proto(__fputc_unlocked) */
 
 /* This variable is incremented each time `error' is called.  */
 unsigned int error_message_count = 0;
diff --git a/libc/misc/file/lockf.c b/libc/misc/file/lockf.c
index bf14808de..58fcdad0a 100644
--- a/libc/misc/file/lockf.c
+++ b/libc/misc/file/lockf.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-libc_hidden_proto(lockf)
+/* libc_hidden_proto(lockf) */
 
 /* Experimentally off - libc_hidden_proto(memset) */
 /* libc_hidden_proto(fcntl) */
diff --git a/libc/misc/file/lockf64.c b/libc/misc/file/lockf64.c
index ba3887329..e4f6f5cce 100644
--- a/libc/misc/file/lockf64.c
+++ b/libc/misc/file/lockf64.c
@@ -32,7 +32,7 @@
 #define F_GETLK F_GETLK64
 #undef F_SETLK
 #define F_SETLK F_SETLK64
-libc_hidden_proto(fcntl64)
+/* libc_hidden_proto(fcntl64) */
 #else
 /* libc_hidden_proto(fcntl) */
 #endif
@@ -42,7 +42,7 @@ libc_hidden_proto(fcntl64)
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */
 
-libc_hidden_proto(lockf64)
+/* libc_hidden_proto(lockf64) */
 int lockf64 (int fd, int cmd, off64_t len64)
 {
     struct flock fl;
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c
index 559a3ca2a..2256cb84c 100644
--- a/libc/misc/fnmatch/fnmatch.c
+++ b/libc/misc/fnmatch/fnmatch.c
@@ -72,7 +72,7 @@
 /* libc_hidden_proto(__ctype_tolower) */
 #endif
 /* libc_hidden_proto(tolower) */
-libc_hidden_proto(fnmatch)
+/* libc_hidden_proto(fnmatch) */
 /* libc_hidden_proto(getenv) */
 #endif
 
@@ -83,19 +83,19 @@ libc_hidden_proto(fnmatch)
 # include <wchar.h>
 # include <wctype.h>
 # ifdef __UCLIBC__
-libc_hidden_proto(wctype)
-libc_hidden_proto(iswctype)
-libc_hidden_proto(btowc)
+/* libc_hidden_proto(wctype) */
+/* libc_hidden_proto(iswctype) */
+/* libc_hidden_proto(btowc) */
 #  ifdef __UCLIBC_HAS_LOCALE__
-libc_hidden_proto(wmemchr)
-libc_hidden_proto(wmempcpy)
-libc_hidden_proto(wcscat)
+/* libc_hidden_proto(wmemchr) */
+/* libc_hidden_proto(wmempcpy) */
+/* libc_hidden_proto(wcscat) */
 /*libc_hidden_proto(wcschr)*/
 /*libc_hidden_proto(wcschrnul)*/
-libc_hidden_proto(wcslen)
-libc_hidden_proto(wcscoll)
-libc_hidden_proto(towlower)
-libc_hidden_proto(mbsrtowcs)
+/* libc_hidden_proto(wcslen) */
+/* libc_hidden_proto(wcscoll) */
+/* libc_hidden_proto(towlower) */
+/* libc_hidden_proto(mbsrtowcs) */
 #  endif
 # endif
 #endif
@@ -369,7 +369,7 @@ is_char_class (const wchar_t *wcs)
 # endif
 
 #ifdef __UCLIBC_HAS_WCHAR__
-libc_hidden_proto(_stdlib_mb_cur_max)
+/* libc_hidden_proto(_stdlib_mb_cur_max) */
 #else
 #undef MB_CUR_MAX
 #define MB_CUR_MAX 1
diff --git a/libc/misc/fnmatch/fnmatch_old.c b/libc/misc/fnmatch/fnmatch_old.c
index 020d97bcf..839c77579 100644
--- a/libc/misc/fnmatch/fnmatch_old.c
+++ b/libc/misc/fnmatch/fnmatch_old.c
@@ -23,7 +23,7 @@ Cambridge, MA 02139, USA.  */
 #include <fnmatch.h>
 #include <ctype.h>
 
-libc_hidden_proto(fnmatch)
+/* libc_hidden_proto(fnmatch) */
 
 /* libc_hidden_proto(tolower) */
 /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/libc/misc/ftw/ftw.c b/libc/misc/ftw/ftw.c
index a3a2002da..afc55f88a 100644
--- a/libc/misc/ftw/ftw.c
+++ b/libc/misc/ftw/ftw.c
@@ -86,21 +86,21 @@ char *alloca ();
 /* Experimentally off - libc_hidden_proto(memset) */
 /* Experimentally off - libc_hidden_proto(strchr) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(dirfd)
-libc_hidden_proto(tsearch)
-libc_hidden_proto(tfind)
-libc_hidden_proto(tdestroy)
-libc_hidden_proto(getcwd)
-libc_hidden_proto(chdir)
-libc_hidden_proto(fchdir)
+/* libc_hidden_proto(dirfd) */
+/* libc_hidden_proto(tsearch) */
+/* libc_hidden_proto(tfind) */
+/* libc_hidden_proto(tdestroy) */
+/* libc_hidden_proto(getcwd) */
+/* libc_hidden_proto(chdir) */
+/* libc_hidden_proto(fchdir) */
 /* Experimentally off - libc_hidden_proto(mempcpy) */
-libc_hidden_proto(opendir)
+/* libc_hidden_proto(opendir) */
 #ifdef __UCLIBC_HAS_LFS__
-libc_hidden_proto(readdir64)
-libc_hidden_proto(lstat64)
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(readdir64) */
+/* libc_hidden_proto(lstat64) */
+/* libc_hidden_proto(stat64) */
 #endif
-libc_hidden_proto(closedir)
+/* libc_hidden_proto(closedir) */
 /* Experimentally off - libc_hidden_proto(stpcpy) */
 /* libc_hidden_proto(lstat) */
 /* libc_hidden_proto(stat) */
diff --git a/libc/misc/glob/glob-susv3.c b/libc/misc/glob/glob-susv3.c
index b1f1a6ad7..8ee0f1a37 100644
--- a/libc/misc/glob/glob-susv3.c
+++ b/libc/misc/glob/glob-susv3.c
@@ -29,10 +29,10 @@
 /* Experimentally off - libc_hidden_proto(strcmp) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
 /* Experimentally off - libc_hidden_proto(strlen) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(closedir)
-libc_hidden_proto(qsort)
-libc_hidden_proto(fnmatch)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(fnmatch) */
 
 struct match
 {
@@ -53,11 +53,11 @@ extern int __glob_match_in_dir(const char *d, const char *p, int flags, int (*er
 # define stat stat64
 # define readdir_r readdir64_r
 # define dirent dirent64
-libc_hidden_proto(readdir64_r)
-libc_hidden_proto(stat64)
+/* libc_hidden_proto(readdir64_r) */
+/* libc_hidden_proto(stat64) */
 # define struct_stat struct stat64
 #else
-libc_hidden_proto(readdir_r)
+/* libc_hidden_proto(readdir_r) */
 /* libc_hidden_proto(stat) */
 # define struct_stat struct stat
 #endif
@@ -224,9 +224,9 @@ int __glob_sort(const void *a, const void *b)
 #endif /* !__GLOB64 */
 
 #ifdef __GLOB64
-libc_hidden_proto(glob64)
+/* libc_hidden_proto(glob64) */
 #else
-libc_hidden_proto(glob)
+/* libc_hidden_proto(glob) */
 #endif
 int glob(const char *pat, int flags, int (*errfunc)(const char *path, int err), glob_t *g)
 {
@@ -302,9 +302,9 @@ libc_hidden_def(glob)
 #endif
 
 #ifdef __GLOB64
-libc_hidden_proto(globfree64)
+/* libc_hidden_proto(globfree64) */
 #else
-libc_hidden_proto(globfree)
+/* libc_hidden_proto(globfree) */
 #endif
 void globfree(glob_t *g)
 {
diff --git a/libc/misc/glob/glob.c b/libc/misc/glob/glob.c
index abc75dee5..5736f4981 100644
--- a/libc/misc/glob/glob.c
+++ b/libc/misc/glob/glob.c
@@ -31,13 +31,13 @@
 #include <fnmatch.h>
 #include <glob.h>
 
-libc_hidden_proto(closedir)
-libc_hidden_proto(fnmatch)
+/* libc_hidden_proto(closedir) */
+/* libc_hidden_proto(fnmatch) */
 /* Experimentally off - libc_hidden_proto(memcpy) */
 /* Experimentally off - libc_hidden_proto(mempcpy) */
-libc_hidden_proto(opendir)
-libc_hidden_proto(qsort)
-libc_hidden_proto(readdir)
+/* libc_hidden_proto(opendir) */
+/* libc_hidden_proto(qsort) */
+/* libc_hidden_proto(readdir) */
 /* Experimentally off - libc_hidden_proto(strchr) */
 /* Experimentally off - libc_hidden_proto(strcoll) */
 /* Experimentally off - libc_hidden_proto(strcpy) */
@@ -48,7 +48,7 @@ libc_hidden_proto(readdir)
 
 #ifdef ENABLE_GLOB_TILDE_EXPANSION
 #include <pwd.h>
-libc_hidden_proto(getpwnam_r)
+/* libc_hidden_proto(getpwnam_r) */
 #endif
 
 #ifdef COMPILE_GLOB64
@@ -62,13 +62,13 @@ libc_hidden_proto(getpwnam_r)
 #define glob_t glob64_t
 #define glob(pattern, flags, errfunc, pglob) glob64 (pattern, flags, errfunc, pglob)
 #define globfree(pglob) globfree64 (pglob)
-libc_hidden_proto(stat64)
-libc_hidden_proto(readdir64)
+/* libc_hidden_proto(stat64) */
+/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir readdir
 #ifdef __UCLIBC_HAS_LFS__
 #define __readdir64 readdir64
-libc_hidden_proto(readdir64)
+/* libc_hidden_proto(readdir64) */
 #else
 #define __readdir64 readdir
 #endif
@@ -132,7 +132,7 @@ extern int __prefix_array (const char *dirname, char **array, size_t n) attribut
 extern const char *__next_brace_sub (const char *cp, int flags) attribute_hidden;
 #endif
 
-libc_hidden_proto(glob_pattern_p)
+/* libc_hidden_proto(glob_pattern_p) */
 #ifndef COMPILE_GLOB64
 /* Return nonzero if PATTERN contains any metacharacters.
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
@@ -489,11 +489,11 @@ static int glob_in_dir (const char *pattern, const char *directory, int flags,
 }
 
 #ifdef COMPILE_GLOB64
-libc_hidden_proto(glob64)
-libc_hidden_proto(globfree64)
+/* libc_hidden_proto(glob64) */
+/* libc_hidden_proto(globfree64) */
 #else
-libc_hidden_proto(glob)
-libc_hidden_proto(globfree)
+/* libc_hidden_proto(glob) */
+/* libc_hidden_proto(globfree) */
 #endif
 /* Do glob searching for PATTERN, placing results in PGLOB.
    The bits defined above may be set in FLAGS.
diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
index a44bf6062..4401ba249 100644
--- a/libc/misc/internals/__errno_location.c
+++ b/libc/misc/internals/__errno_location.c
@@ -6,8 +6,8 @@
 
 #include "internal_errno.h"
 
-/* psm: moved to bits/errno.h: libc_hidden_proto(__errno_location) */
-libc_hidden_proto(__errno_location)
+/* psm: moved to bits/errno.h: */
+/* libc_hidden_proto(__errno_location) */
 int * weak_const_function __errno_location (void)
 {
     return &errno;
diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
index 2ac21774c..f4a587e96 100644
--- a/libc/misc/internals/__h_errno_location.c
+++ b/libc/misc/internals/__h_errno_location.c
@@ -6,7 +6,7 @@
 
 #include "internal_errno.h"
 
-libc_hidden_proto(__h_errno_location)
+/* libc_hidden_proto(__h_errno_location) */
 int * weak_const_function __h_errno_location (void)
 {
     return &h_errno;
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index af4bfac42..5f31e347c 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -34,10 +34,10 @@
 #endif
 #if