From cb97aadebfeba7f5e8f1b85beee5ab10e88c2990 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 20 Nov 2008 22:11:44 +0000 Subject: Last portion of libc_hidden_proto removal. Appears to build fine (several .configs tried) --- libc/misc/assert/__assert.c | 2 +- libc/misc/ctype/ctype.c | 32 ++++++++++++++---------- libc/misc/dirent/closedir.c | 2 +- libc/misc/dirent/dirfd.c | 2 +- libc/misc/dirent/opendir.c | 2 +- libc/misc/dirent/readdir.c | 2 +- libc/misc/dirent/readdir64.c | 2 +- libc/misc/dirent/readdir64_r.c | 2 +- libc/misc/dirent/readdir_r.c | 2 +- libc/misc/dirent/scandir.c | 8 +++--- libc/misc/dirent/scandir64.c | 8 +++--- libc/misc/error/err.c | 10 ++++---- libc/misc/error/error.c | 8 +++--- libc/misc/file/lockf.c | 2 +- libc/misc/file/lockf64.c | 4 +-- libc/misc/fnmatch/fnmatch.c | 24 +++++++++--------- libc/misc/fnmatch/fnmatch_old.c | 2 +- libc/misc/ftw/ftw.c | 24 +++++++++--------- libc/misc/glob/glob-susv3.c | 22 ++++++++--------- libc/misc/glob/glob.c | 28 ++++++++++----------- libc/misc/internals/__errno_location.c | 4 +-- libc/misc/internals/__h_errno_location.c | 2 +- libc/misc/internals/__uClibc_main.c | 8 +++--- libc/misc/internals/errno.c | 4 +-- libc/misc/internals/tempname.c | 4 +-- libc/misc/locale/locale.c | 16 ++++++------ libc/misc/mntent/mntent.c | 10 ++++---- libc/misc/regex/regcomp.c | 2 +- libc/misc/regex/regex.c | 26 ++++++++++---------- libc/misc/regex/regex_internal.h | 2 +- libc/misc/regex/regex_old.c | 16 ++++++------ libc/misc/search/_hsearch_r.c | 6 ++--- libc/misc/search/_lsearch.c | 2 +- libc/misc/search/_tsearch.c | 6 ++--- libc/misc/search/hsearch.c | 6 ++--- libc/misc/statfs/fstatfs64.c | 2 +- libc/misc/statfs/fstatvfs.c | 8 +++--- libc/misc/statfs/fstatvfs64.c | 12 ++++----- libc/misc/statfs/statfs64.c | 2 +- libc/misc/statfs/statvfs.c | 8 +++--- libc/misc/statfs/statvfs64.c | 12 ++++----- libc/misc/syslog/syslog.c | 16 ++++++------ libc/misc/sysvipc/shm.c | 2 +- libc/misc/time/adjtime.c | 2 +- libc/misc/time/time.c | 40 +++++++++++++++--------------- libc/misc/ttyent/getttyent.c | 16 ++++++------ libc/misc/utmp/utent.c | 4 +-- libc/misc/utmp/wtent.c | 4 +-- libc/misc/wchar/wchar.c | 42 +++++++++++++++++--------------- libc/misc/wctype/_wctype.c | 26 ++++++++++---------- libc/misc/wordexp/wordexp.c | 32 ++++++++++++------------ 51 files changed, 269 insertions(+), 261 deletions(-) (limited to 'libc/misc') 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 #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 #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 #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 #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 #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 #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 #include -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 # include # 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 #include -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 #include -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 -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 #ifndef __ARCH_HAS_NO_LDSO__ /* Experimentally off - libc_hidden_proto(memcpy) */ -libc_hidden_proto(getgid) -libc_hidden_proto(getuid) -libc_hidden_proto(getegid) -libc_hidden_proto(geteuid) +/* libc_hidden_proto(getgid) */ +/* libc_hidden_proto(getuid) */ +/* libc_hidden_proto(getegid) */ +/* libc_hidden_proto(geteuid) */ /* libc_hidden_proto(fstat) */ /* libc_hidden_proto(abort) */ diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c index fcf143fb5..20b26b2b6 100644 --- a/libc/misc/internals/errno.c +++ b/libc/misc/internals/errno.c @@ -1,8 +1,8 @@ #include "internal_errno.h" #ifdef __UCLIBC_HAS_THREADS__ -libc_hidden_proto(errno) -libc_hidden_proto(h_errno) +/* libc_hidden_proto(errno) */ +/* libc_hidden_proto(h_errno) */ #endif int errno = 0; int h_errno = 0; diff --git a/libc/misc/internals/tempname.c b/libc/misc/internals/tempname.c index 8ce277555..10d00041c 100644 --- a/libc/misc/internals/tempname.c +++ b/libc/misc/internals/tempname.c @@ -48,10 +48,10 @@ /* Experimentally off - libc_hidden_proto(strlen) */ /* Experimentally off - libc_hidden_proto(strcmp) */ /* libc_hidden_proto(sprintf) */ -libc_hidden_proto(mkdir) +/* libc_hidden_proto(mkdir) */ /* libc_hidden_proto(open) */ #ifdef __UCLIBC_HAS_LFS__ -libc_hidden_proto(open64) +/* libc_hidden_proto(open64) */ #endif /* libc_hidden_proto(read) */ /* libc_hidden_proto(close) */ diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c index c1f91bcee..71bd77951 100644 --- a/libc/misc/locale/locale.c +++ b/libc/misc/locale/locale.c @@ -194,7 +194,7 @@ static const char utf8[] = "UTF-8"; static char hr_locale[(MAX_LOCALE_CATEGORY_STR * LC_ALL) + MAX_LOCALE_STR]; /* Experimentally off - libc_hidden_proto(stpcpy) */ -libc_hidden_proto(newlocale) +/* libc_hidden_proto(newlocale) */ static void update_hr_locale(const unsigned char *spec) { @@ -303,7 +303,7 @@ char *setlocale(int category, const char *locale) * placement of the fields in the struct. If necessary, we could ensure * this usings an array of offsets but at some size cost. */ -libc_hidden_proto(localeconv) +/* libc_hidden_proto(localeconv) */ #ifdef __LOCALE_C_ONLY @@ -369,7 +369,7 @@ libc_hidden_def(localeconv) #ifndef __UCLIBC_HAS_XLOCALE__ /* libc_hidden_proto(__ctype_b) */ /* libc_hidden_proto(__ctype_tolower) */ -libc_hidden_proto(__ctype_toupper) +/* libc_hidden_proto(__ctype_toupper) */ #endif __uclibc_locale_t __global_locale_data; @@ -1026,7 +1026,7 @@ static const unsigned char nl_data[C_LC_ALL + 1 + 90 + 320] = { ']', '\x00', '^', '[', 'n', 'N', ']', '\x00', }; -libc_hidden_proto(nl_langinfo) +/* libc_hidden_proto(nl_langinfo) */ char *nl_langinfo(nl_item item) { unsigned int c; @@ -1046,9 +1046,9 @@ libc_hidden_def(nl_langinfo) #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) -libc_hidden_proto(nl_langinfo) +/* libc_hidden_proto(nl_langinfo) */ -libc_hidden_proto(nl_langinfo_l) +/* libc_hidden_proto(nl_langinfo_l) */ char *nl_langinfo(nl_item item) { @@ -1085,7 +1085,7 @@ libc_hidden_def(__XL_NPP(nl_langinfo)) #ifdef L_newlocale /* Experimentally off - libc_hidden_proto(stpcpy) */ -libc_hidden_proto(newlocale) +/* libc_hidden_proto(newlocale) */ #ifdef __UCLIBC_MJN3_ONLY__ #warning TODO: Move posix and utf8 strings. @@ -1330,7 +1330,7 @@ libc_hidden_def(newlocale) /**********************************************************************/ #ifdef L_duplocale -libc_hidden_proto(duplocale) +/* libc_hidden_proto(duplocale) */ #ifdef __UCLIBC_MJN3_ONLY__ #warning REMINDER: When we allocate ctype tables, remember to dup them. diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c index 9730b5237..55f672a3c 100644 --- a/libc/misc/mntent/mntent.c +++ b/libc/misc/mntent/mntent.c @@ -12,16 +12,16 @@ __UCLIBC_MUTEX_STATIC(mylock, PTHREAD_MUTEX_INITIALIZER); -libc_hidden_proto(getmntent_r) -libc_hidden_proto(setmntent) -libc_hidden_proto(endmntent) +/* libc_hidden_proto(getmntent_r) */ +/* libc_hidden_proto(setmntent) */ +/* libc_hidden_proto(endmntent) */ /* Experimentally off - libc_hidden_proto(strstr) */ /* Experimentally off - libc_hidden_proto(strtok_r) */ -libc_hidden_proto(atoi) +/* libc_hidden_proto(atoi) */ /* libc_hidden_proto(fopen) */ /* libc_hidden_proto(fclose) */ -libc_hidden_proto(fseek) +/* libc_hidden_proto(fseek) */ /* libc_hidden_proto(fgets) */ /* libc_hidden_proto(abort) */ /* libc_hidden_proto(fprintf) */ diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index 210ae05ee..0b3b585ce 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -806,7 +806,7 @@ re_compile_internal (regex_t *preg, const char * pattern, size_t length, as the initial length of some arrays. */ #ifdef __UCLIBC_HAS_WCHAR__ -libc_hidden_proto(_stdlib_mb_cur_max) +/* libc_hidden_proto(_stdlib_mb_cur_max) */ #endif static reg_errcode_t diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c index 2dc196782..623a3c6bb 100644 --- a/libc/misc/regex/regex.c +++ b/libc/misc/regex/regex.c @@ -46,17 +46,17 @@ #define __wcrtomb wcrtomb #define __btowc btowc #define __wctype wctype -libc_hidden_proto(wcscoll) -libc_hidden_proto(wcrtomb) -libc_hidden_proto(mbrtowc) -libc_hidden_proto(iswctype) -libc_hidden_proto(iswlower) -libc_hidden_proto(iswalnum) -libc_hidden_proto(towlower) -libc_hidden_proto(towupper) -libc_hidden_proto(mbsinit) -libc_hidden_proto(btowc) -libc_hidden_proto(wctype) +/* libc_hidden_proto(wcscoll) */ +/* libc_hidden_proto(wcrtomb) */ +/* libc_hidden_proto(mbrtowc) */ +/* libc_hidden_proto(iswctype) */ +/* libc_hidden_proto(iswlower) */ +/* libc_hidden_proto(iswalnum) */ +/* libc_hidden_proto(towlower) */ +/* libc_hidden_proto(towupper) */ +/* libc_hidden_proto(mbsinit) */ +/* libc_hidden_proto(btowc) */ +/* libc_hidden_proto(wctype) */ #endif @@ -71,9 +71,9 @@ libc_hidden_proto(wctype) /* libc_hidden_proto(__ctype_toupper_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ /* libc_hidden_proto(__ctype_b) */ -libc_hidden_proto(__ctype_toupper) +/* libc_hidden_proto(__ctype_toupper) */ #else -libc_hidden_proto(isascii) +/* libc_hidden_proto(isascii) */ #endif /* libc_hidden_proto(toupper) */ /* libc_hidden_proto(tolower) */ diff --git a/libc/misc/regex/regex_internal.h b/libc/misc/regex/regex_internal.h index 725e33a5a..f0499caf0 100644 --- a/libc/misc/regex/regex_internal.h +++ b/libc/misc/regex/regex_internal.h @@ -29,7 +29,7 @@ #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC # include -libc_hidden_proto(nl_langinfo) +/* libc_hidden_proto(nl_langinfo) */ #endif #if defined HAVE_LOCALE_H || defined _LIBC # include diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index e8201e90a..76350fc4e 100644 --- a/libc/misc/regex/regex_old.c +++ b/libc/misc/regex/regex_old.c @@ -75,14 +75,14 @@ /* Solaris 2.5 has a bug: must be included before . */ # include # include -libc_hidden_proto(wcslen) -libc_hidden_proto(mbrtowc) -libc_hidden_proto(wcrtomb) -libc_hidden_proto(wcscoll) -libc_hidden_proto(wctype) -libc_hidden_proto(iswctype) -libc_hidden_proto(iswalnum) -libc_hidden_proto(btowc) +/* libc_hidden_proto(wcslen) */ +/* libc_hidden_proto(mbrtowc) */ +/* libc_hidden_proto(wcrtomb) */ +/* libc_hidden_proto(wcscoll) */ +/* libc_hidden_proto(wctype) */ +/* libc_hidden_proto(iswctype) */ +/* libc_hidden_proto(iswalnum) */ +/* libc_hidden_proto(btowc) */ # endif diff --git a/libc/misc/search/_hsearch_r.c b/libc/misc/search/_hsearch_r.c index c9c4a9ccf..85475cf5e 100644 --- a/libc/misc/search/_hsearch_r.c +++ b/libc/misc/search/_hsearch_r.c @@ -64,7 +64,7 @@ static int isprime (unsigned int number) indexing as explained in the comment for the hsearch function. The contents of the table is zeroed, especially the field used becomes zero. */ -libc_hidden_proto(hcreate_r) +/* libc_hidden_proto(hcreate_r) */ int hcreate_r (size_t nel, struct hsearch_data *htab) { /* Test for correct arguments. */ @@ -100,7 +100,7 @@ libc_hidden_def(hcreate_r) #ifdef L_hdestroy_r /* After using the hash table it has to be destroyed. The used memory can be freed and the local static variable can be marked as not used. */ -libc_hidden_proto(hdestroy_r) +/* libc_hidden_proto(hdestroy_r) */ void hdestroy_r (struct hsearch_data *htab) { /* Test for correct arguments. */ @@ -137,7 +137,7 @@ libc_hidden_def(hdestroy_r) /* Experimentally off - libc_hidden_proto(strcmp) */ /* Experimentally off - libc_hidden_proto(strlen) */ -libc_hidden_proto(hsearch_r) +/* libc_hidden_proto(hsearch_r) */ int hsearch_r (ENTRY item, ACTION action, ENTRY **retval, struct hsearch_data *htab) { diff --git a/libc/misc/search/_lsearch.c b/libc/misc/search/_lsearch.c index e446489ed..da737bab4 100644 --- a/libc/misc/search/_lsearch.c +++ b/libc/misc/search/_lsearch.c @@ -12,7 +12,7 @@ #include #include -libc_hidden_proto(lfind) +/* libc_hidden_proto(lfind) */ #ifdef L_lfind diff --git a/libc/misc/search/_tsearch.c b/libc/misc/search/_tsearch.c index 3d43aa543..5f3706d64 100644 --- a/libc/misc/search/_tsearch.c +++ b/libc/misc/search/_tsearch.c @@ -50,7 +50,7 @@ register node **rootp; address of tree root int (*compar)(); ordering function */ -libc_hidden_proto(tsearch) +/* libc_hidden_proto(tsearch) */ void *tsearch(__const void *key, void **vrootp, __compar_fn_t compar) { register node *q; @@ -81,7 +81,7 @@ libc_hidden_def(tsearch) #endif #ifdef L_tfind -libc_hidden_proto(tfind) +/* libc_hidden_proto(tfind) */ void *tfind(__const void *key, void * __const *vrootp, __compar_fn_t compar) { register node **rootp = (node **) vrootp; @@ -208,7 +208,7 @@ tdestroy_recurse (node *root, __free_fn_t freefct) free (root); } -libc_hidden_proto(tdestroy) +/* libc_hidden_proto(tdestroy) */ void tdestroy (void *vroot, __free_fn_t freefct) { node *root = (node *) vroot; diff --git a/libc/misc/search/hsearch.c b/libc/misc/search/hsearch.c index b1228e2ee..3ecc42567 100644 --- a/libc/misc/search/hsearch.c +++ b/libc/misc/search/hsearch.c @@ -19,9 +19,9 @@ #include -libc_hidden_proto(hdestroy_r) -libc_hidden_proto(hsearch_r) -libc_hidden_proto(hcreate_r) +/* libc_hidden_proto(hdestroy_r) */ +/* libc_hidden_proto(hsearch_r) */ +/* libc_hidden_proto(hcreate_r) */ /* The non-reentrant version use a global space for storing the table. */ static struct hsearch_data htab; diff --git a/libc/misc/statfs/fstatfs64.c b/libc/misc/statfs/fstatfs64.c index dfd027941..dc6027373 100644 --- a/libc/misc/statfs/fstatfs64.c +++ b/libc/misc/statfs/fstatfs64.c @@ -30,7 +30,7 @@ extern __typeof(fstatfs) __libc_fstatfs; libc_hidden_proto(__libc_fstatfs) /* Return information about the filesystem on which FD resides. */ -libc_hidden_proto(fstatfs64) +/* libc_hidden_proto(fstatfs64) */ int fstatfs64 (int fd, struct statfs64 *buf) { struct statfs buf32; diff --git a/libc/misc/statfs/fstatvfs.c b/libc/misc/statfs/fstatvfs.c index 9f2d1ed61..547a9c36a 100644 --- a/libc/misc/statfs/fstatvfs.c +++ b/libc/misc/statfs/fstatvfs.c @@ -30,9 +30,9 @@ /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(strcmp) */ /* Experimentally off - libc_hidden_proto(strsep) */ -libc_hidden_proto(setmntent) -libc_hidden_proto(getmntent_r) -libc_hidden_proto(endmntent) +/* libc_hidden_proto(setmntent) */ +/* libc_hidden_proto(getmntent_r) */ +/* libc_hidden_proto(endmntent) */ /* libc_hidden_proto(stat) */ #ifndef __USE_FILE_OFFSET64 @@ -51,7 +51,7 @@ extern __typeof(fstatfs) __libc_fstatfs; libc_hidden_proto(__libc_fstatfs) /* libc_hidden_proto(fstat) */ /* libc_hidden_proto(stat) */ -libc_hidden_proto(fstatvfs) +/* libc_hidden_proto(fstatvfs) */ int fstatvfs (int fd, struct statvfs *buf) { diff --git a/libc/misc/statfs/fstatvfs64.c b/libc/misc/statfs/fstatvfs64.c index 906eed327..f06836265 100644 --- a/libc/misc/statfs/fstatvfs64.c +++ b/libc/misc/statfs/fstatvfs64.c @@ -32,18 +32,18 @@ /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(strcmp) */ /* Experimentally off - libc_hidden_proto(strsep) */ -libc_hidden_proto(setmntent) -libc_hidden_proto(getmntent_r) -libc_hidden_proto(endmntent) +/* libc_hidden_proto(setmntent) */ +/* libc_hidden_proto(getmntent_r) */ +/* libc_hidden_proto(endmntent) */ #undef stat #define stat stat64 #if !defined __UCLIBC_LINUX_SPECIFIC__ -libc_hidden_proto(fstatvfs) +/* libc_hidden_proto(fstatvfs) */ #else -libc_hidden_proto(fstatfs64) +/* libc_hidden_proto(fstatfs64) */ #endif -libc_hidden_proto(fstat64) +/* libc_hidden_proto(fstat64) */ /* libc_hidden_proto(stat) */ int fstatvfs64 (int fd, struct statvfs64 *buf) diff --git a/libc/misc/statfs/statfs64.c b/libc/misc/statfs/statfs64.c index 6b3558b5e..c73c6ae50 100644 --- a/libc/misc/statfs/statfs64.c +++ b/libc/misc/statfs/statfs64.c @@ -28,7 +28,7 @@ extern __typeof(statfs) __libc_statfs; libc_hidden_proto(__libc_statfs) /* Return information about the filesystem on which FILE resides. */ -libc_hidden_proto(statfs64) +/* libc_hidden_proto(statfs64) */ int statfs64 (const char *file, struct statfs64 *buf) { struct statfs buf32; diff --git a/libc/misc/statfs/statvfs.c b/libc/misc/statfs/statvfs.c index 795f19e79..9bfbe6ea9 100644 --- a/libc/misc/statfs/statvfs.c +++ b/libc/misc/statfs/statvfs.c @@ -30,15 +30,15 @@ /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(strcmp) */ /* Experimentally off - libc_hidden_proto(strsep) */ -libc_hidden_proto(setmntent) -libc_hidden_proto(getmntent_r) -libc_hidden_proto(endmntent) +/* libc_hidden_proto(setmntent) */ +/* libc_hidden_proto(getmntent_r) */ +/* libc_hidden_proto(endmntent) */ extern __typeof(statfs) __libc_statfs; libc_hidden_proto(__libc_statfs) /* libc_hidden_proto(stat) */ -libc_hidden_proto(statvfs) +/* libc_hidden_proto(statvfs) */ int statvfs (const char *file, struct statvfs *buf) { struct statfs fsbuf; diff --git a/libc/misc/statfs/statvfs64.c b/libc/misc/statfs/statvfs64.c index 008ba78c9..3f1defefc 100644 --- a/libc/misc/statfs/statvfs64.c +++ b/libc/misc/statfs/statvfs64.c @@ -31,18 +31,18 @@ /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(strcmp) */ /* Experimentally off - libc_hidden_proto(strsep) */ -libc_hidden_proto(setmntent) -libc_hidden_proto(getmntent_r) -libc_hidden_proto(endmntent) +/* libc_hidden_proto(setmntent) */ +/* libc_hidden_proto(getmntent_r) */ +/* libc_hidden_proto(endmntent) */ #undef stat #define stat stat64 #if defined __UCLIBC_LINUX_SPECIFIC__ -libc_hidden_proto(statfs64) +/* libc_hidden_proto(statfs64) */ #else -libc_hidden_proto(statvfs) +/* libc_hidden_proto(statvfs) */ #endif -libc_hidden_proto(stat64) +/* libc_hidden_proto(stat64) */ int statvfs64 (const char *file, struct statvfs64 *buf) { diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c index 508cd7192..ccc71ddec 100644 --- a/libc/misc/syslog/syslog.c +++ b/libc/misc/syslog/syslog.c @@ -79,10 +79,10 @@ #include #include -libc_hidden_proto(openlog) -libc_hidden_proto(syslog) -libc_hidden_proto(vsyslog) -libc_hidden_proto(closelog) +/* libc_hidden_proto(openlog) */ +/* libc_hidden_proto(syslog) */ +/* libc_hidden_proto(vsyslog) */ +/* libc_hidden_proto(closelog) */ /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(memcpy) */ @@ -96,12 +96,12 @@ libc_hidden_proto(closelog) /* libc_hidden_proto(close) */ /* libc_hidden_proto(write) */ /* libc_hidden_proto(getpid) */ -libc_hidden_proto(ctime) +/* libc_hidden_proto(ctime) */ /* libc_hidden_proto(sigaction) */ -libc_hidden_proto(sigemptyset) -libc_hidden_proto(connect) +/* libc_hidden_proto(sigemptyset) */ +/* libc_hidden_proto(connect) */ /* libc_hidden_proto(sprintf) */ -libc_hidden_proto(vsnprintf) +/* libc_hidden_proto(vsnprintf) */ /* Experimentally off - libc_hidden_proto(time) */ #include diff --git a/libc/misc/sysvipc/shm.c b/libc/misc/sysvipc/shm.c index 9d71161cb..164580efe 100644 --- a/libc/misc/sysvipc/shm.c +++ b/libc/misc/sysvipc/shm.c @@ -38,7 +38,7 @@ _syscall3(void *, shmat, int, shmid, const void *,shmaddr, int, shmflg) #else /* psm: don't remove this, else mips will fail */ #include -libc_hidden_proto(getpagesize) +/* libc_hidden_proto(getpagesize) */ void * shmat (int shmid, const void *shmaddr, int shmflg) { diff --git a/libc/misc/time/adjtime.c b/libc/misc/time/adjtime.c index cfa94339a..808046eef 100644 --- a/libc/misc/time/adjtime.c +++ b/libc/misc/time/adjtime.c @@ -9,7 +9,7 @@ #include #include -libc_hidden_proto(adjtimex) +/* libc_hidden_proto(adjtimex) */ #define MAX_SEC (LONG_MAX / 1000000L - 2) #define MIN_SEC (LONG_MIN / 1000000L + 2) diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index ce58c8fe9..ae800e1ca 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -154,11 +154,11 @@ #include #endif -libc_hidden_proto(asctime) -libc_hidden_proto(asctime_r) -libc_hidden_proto(ctime) -libc_hidden_proto(localtime) -libc_hidden_proto(localtime_r) +/* libc_hidden_proto(asctime) */ +/* libc_hidden_proto(asctime_r) */ +/* libc_hidden_proto(ctime) */ +/* libc_hidden_proto(localtime) */ +/* libc_hidden_proto(localtime_r) */ /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(memcpy) */ @@ -171,18 +171,18 @@ libc_hidden_proto(localtime_r) /* libc_hidden_proto(read) */ /* libc_hidden_proto(close) */ /* libc_hidden_proto(getenv) */ -libc_hidden_proto(tzset) +/* libc_hidden_proto(tzset) */ /* libc_hidden_proto(gettimeofday) */ /* Experimentally off - libc_hidden_proto(strncasecmp) */ -libc_hidden_proto(strtol) -libc_hidden_proto(strtoul) -libc_hidden_proto(nl_langinfo) +/* libc_hidden_proto(strtol) */ +/* libc_hidden_proto(strtoul) */ +/* libc_hidden_proto(nl_langinfo) */ #ifdef __UCLIBC_HAS_XLOCALE__ /* Experimentally off - libc_hidden_proto(strncasecmp_l) */ -libc_hidden_proto(strtol_l) -libc_hidden_proto(strtoul_l) -libc_hidden_proto(nl_langinfo_l) +/* libc_hidden_proto(strtol_l) */ +/* libc_hidden_proto(strtoul_l) */ +/* libc_hidden_proto(nl_langinfo_l) */ /* libc_hidden_proto(__ctype_b_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ /* libc_hidden_proto(__ctype_b) */ @@ -433,7 +433,7 @@ libc_hidden_def(asctime_r) #include -libc_hidden_proto(times) +/* libc_hidden_proto(times) */ #ifndef __BCC__ #if CLOCKS_PER_SEC != 1000000L @@ -809,9 +809,9 @@ time_t timegm(struct tm *timeptr) #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) -libc_hidden_proto(strftime) +/* libc_hidden_proto(strftime) */ -libc_hidden_proto(strftime_l) +/* libc_hidden_proto(strftime_l) */ size_t strftime(char *__restrict s, size_t maxsize, const char *__restrict format, @@ -1330,9 +1330,9 @@ libc_hidden_def(__XL_NPP(strftime)) #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) -libc_hidden_proto(strptime) +/* libc_hidden_proto(strptime) */ -libc_hidden_proto(strptime_l) +/* libc_hidden_proto(strptime_l) */ char *strptime(const char *__restrict buf, const char *__restrict format, struct tm *__restrict tm) @@ -1866,7 +1866,7 @@ ERROR: #endif /* __UCLIBC_HAS_TZ_FILE__ */ #ifndef __UCLIBC_HAS_CTYPE_TABLES__ -libc_hidden_proto(isascii) +/* libc_hidden_proto(isascii) */ #endif void tzset(void) @@ -2414,9 +2414,9 @@ DONE: #if defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) -libc_hidden_proto(wcsftime) +/* libc_hidden_proto(wcsftime) */ -libc_hidden_proto(wcsftime_l) +/* libc_hidden_proto(wcsftime_l) */ size_t wcsftime(wchar_t *__restrict s, size_t maxsize, const wchar_t *__restrict format, diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c index 88bc2be70..dd6d9ad62 100644 --- a/libc/misc/ttyent/getttyent.c +++ b/libc/misc/ttyent/getttyent.c @@ -41,11 +41,11 @@ /* Experimentally off - libc_hidden_proto(strchr) */ /* Experimentally off - libc_hidden_proto(strcmp) */ /* Experimentally off - libc_hidden_proto(strncmp) */ -libc_hidden_proto(__fsetlocking) -libc_hidden_proto(rewind) -libc_hidden_proto(fgets_unlocked) -libc_hidden_proto(getc_unlocked) -libc_hidden_proto(__fgetc_unlocked) +/* libc_hidden_proto(__fsetlocking) */ +/* libc_hidden_proto(rewind) */ +/* libc_hidden_proto(fgets_unlocked) */ +/* libc_hidden_proto(getc_unlocked) */ +/* libc_hidden_proto(__fgetc_unlocked) */ /* libc_hidden_proto(fopen) */ /* libc_hidden_proto(fclose) */ /* libc_hidden_proto(abort) */ @@ -102,7 +102,7 @@ static char * value(register char *p) return ((p = strchr(p, '=')) ? ++p : NULL); } -libc_hidden_proto(setttyent) +/* libc_hidden_proto(setttyent) */ int setttyent(void) { @@ -120,7 +120,7 @@ int setttyent(void) } libc_hidden_def(setttyent) -libc_hidden_proto(getttyent) +/* libc_hidden_proto(getttyent) */ struct ttyent * getttyent(void) { register int c; @@ -201,7 +201,7 @@ struct ttyent * getttyent(void) } libc_hidden_def(getttyent) -libc_hidden_proto(endttyent) +/* libc_hidden_proto(endttyent) */ int endttyent(void) { int rval; diff --git a/libc/misc/utmp/utent.c b/libc/misc/utmp/utent.c index 627839715..cc036cb6d 100644 --- a/libc/misc/utmp/utent.c +++ b/libc/misc/utmp/utent.c @@ -68,7 +68,7 @@ bummer: return; } -libc_hidden_proto(setutent) +/* libc_hidden_proto(setutent) */ void setutent(void) { __UCLIBC_MUTEX_LOCK(utmplock); @@ -143,7 +143,7 @@ static struct utmp *__getutid(const struct utmp *utmp_entry) return NULL; } -libc_hidden_proto(getutid) +/* libc_hidden_proto(getutid) */ struct utmp *getutid(const struct utmp *utmp_entry) { struct utmp *ret = NULL; diff --git a/libc/misc/utmp/wtent.c b/libc/misc/utmp/wtent.c index 12ffc1a86..b7a581785 100644 --- a/libc/misc/utmp/wtent.c +++ b/libc/misc/utmp/wtent.c @@ -17,12 +17,12 @@ #if 0 /* Experimentally off - libc_hidden_proto(memset) */ /* Experimentally off - libc_hidden_proto(strncpy) */ -libc_hidden_proto(updwtmp) +/* libc_hidden_proto(updwtmp) */ #endif /* libc_hidden_proto(open) */ /* libc_hidden_proto(write) */ /* libc_hidden_proto(close) */ -libc_hidden_proto(lockf) +/* libc_hidden_proto(lockf) */ /* libc_hidden_proto(gettimeofday) */ #if 0 diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c index 6214243e3..9a0ceb293 100644 --- a/libc/misc/wchar/wchar.c +++ b/libc/misc/wchar/wchar.c @@ -174,9 +174,9 @@ extern size_t _wchar_wcsntoutf8s(char *__restrict s, size_t n, /**********************************************************************/ #ifdef L_btowc -libc_hidden_proto(mbrtowc) +/* libc_hidden_proto(mbrtowc) */ -libc_hidden_proto(btowc) +/* libc_hidden_proto(btowc) */ wint_t btowc(int c) { #ifdef __CTYPE_HAS_8_BIT_LOCALES @@ -215,7 +215,7 @@ libc_hidden_def(btowc) /* Note: We completely ignore ps in all currently supported conversions. */ -libc_hidden_proto(wcrtomb) +/* libc_hidden_proto(wcrtomb) */ int wctob(wint_t c) { @@ -246,7 +246,7 @@ int wctob(wint_t c) /**********************************************************************/ #ifdef L_mbsinit -libc_hidden_proto(mbsinit) +/* libc_hidden_proto(mbsinit) */ int mbsinit(const mbstate_t *ps) { return !ps || !ps->__mask; @@ -257,9 +257,9 @@ libc_hidden_def(mbsinit) /**********************************************************************/ #ifdef L_mbrlen -libc_hidden_proto(mbrtowc) +/* libc_hidden_proto(mbrtowc) */ -libc_hidden_proto(mbrlen) +/* libc_hidden_proto(mbrlen) */ size_t mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps) { static mbstate_t mbstate; /* Rely on bss 0-init. */ @@ -272,9 +272,9 @@ libc_hidden_def(mbrlen) /**********************************************************************/ #ifdef L_mbrtowc -libc_hidden_proto(mbsnrtowcs) +/* libc_hidden_proto(mbsnrtowcs) */ -libc_hidden_proto(mbrtowc) +/* libc_hidden_proto(mbrtowc) */ size_t mbrtowc(wchar_t *__restrict pwc, const char *__restrict s, size_t n, mbstate_t *__restrict ps) { @@ -338,12 +338,12 @@ libc_hidden_def(mbrtowc) /**********************************************************************/ #ifdef L_wcrtomb -libc_hidden_proto(wcsnrtombs) +/* libc_hidden_proto(wcsnrtombs) */ /* Note: We completely ignore ps in all currently supported conversions. */ /* TODO: Check for valid state anyway? */ -libc_hidden_proto(wcrtomb) +/* libc_hidden_proto(wcrtomb) */ size_t wcrtomb(register char *__restrict s, wchar_t wc, mbstate_t *__restrict ps) { @@ -372,9 +372,9 @@ libc_hidden_def(wcrtomb) /**********************************************************************/ #ifdef L_mbsrtowcs -libc_hidden_proto(mbsnrtowcs) +/* libc_hidden_proto(mbsnrtowcs) */ -libc_hidden_proto(mbsrtowcs) +/* libc_hidden_proto(mbsrtowcs) */ size_t mbsrtowcs(wchar_t *__restrict dst, const char **__restrict src, size_t len, mbstate_t *__restrict ps) { @@ -393,9 +393,9 @@ libc_hidden_def(mbsrtowcs) * TODO: Check for valid state anyway? */ -libc_hidden_proto(wcsnrtombs) +/* libc_hidden_proto(wcsnrtombs) */ -libc_hidden_proto(wcsrtombs) +/* libc_hidden_proto(wcsrtombs) */ size_t wcsrtombs(char *__restrict dst, const wchar_t **__restrict src, size_t len, mbstate_t *__restrict ps) { @@ -700,7 +700,7 @@ size_t attribute_hidden _wchar_wcsntoutf8s(char *__restrict s, size_t n, /* WARNING: We treat len as SIZE_MAX when dst is NULL! */ -libc_hidden_proto(mbsnrtowcs) +/* libc_hidden_proto(mbsnrtowcs) */ size_t mbsnrtowcs(wchar_t *__restrict dst, const char **__restrict src, size_t NMC, size_t len, mbstate_t *__restrict ps) { @@ -810,7 +810,7 @@ libc_hidden_def(mbsnrtowcs) /* Note: We completely ignore ps in all currently supported conversions. * TODO: Check for valid state anyway? */ -libc_hidden_proto(wcsnrtombs) +/* libc_hidden_proto(wcsnrtombs) */ size_t wcsnrtombs(char *__restrict dst, const wchar_t **__restrict src, size_t NWC, size_t len, mbstate_t *__restrict ps) { @@ -924,7 +924,7 @@ libc_hidden_def(wcsnrtombs) /**********************************************************************/ #ifdef L_wcswidth -libc_hidden_proto(wcswidth) +/* libc_hidden_proto(wcswidth) */ #ifdef __UCLIBC_MJN3_ONLY__ #warning REMINDER: If we start doing translit, wcwidth and wcswidth will need updating. @@ -1040,7 +1040,7 @@ static const signed char new_wtbl[] = { 0, 2, 1, 2, 1, 0, 1, }; -libc_hidden_proto(wcsnrtombs) +/* libc_hidden_proto(wcsnrtombs) */ int wcswidth(const wchar_t *pwcs, size_t n) { @@ -1168,7 +1168,7 @@ libc_hidden_def(wcswidth) /**********************************************************************/ #ifdef L_wcwidth -libc_hidden_proto(wcswidth) +/* libc_hidden_proto(wcswidth) */ int wcwidth(wchar_t wc) { @@ -1238,8 +1238,10 @@ enum { * */ +//vda:TODO: make hidden + extern const unsigned char __iconv_codesets[]; -libc_hidden_proto(__iconv_codesets) +/* libc_hidden_proto(__iconv_codesets) */ const unsigned char __iconv_codesets[] = "\x0a\xe0""WCHAR_T\x00" /* superset of UCS-4 but platform-endian */ #if __BYTE_ORDER == __BIG_ENDIAN diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c index 4437d9181..16bc5237a 100644 --- a/libc/misc/wctype/_wctype.c +++ b/libc/misc/wctype/_wctype.c @@ -40,10 +40,10 @@ /* Experimentally off - libc_hidden_proto(strcmp) */ /* libc_hidden_proto(tolower) */ /* libc_hidden_proto(toupper) */ -libc_hidden_proto(towlower) -libc_hidden_proto(towupper) -libc_hidden_proto(towctrans) -libc_hidden_proto(iswctype) +/* libc_hidden_proto(towlower) */ +/* libc_hidden_proto(towupper) */ +/* libc_hidden_proto(towctrans) */ +/* libc_hidden_proto(iswctype) */ #if defined(__LOCALE_C_ONLY) && defined(__UCLIBC_DO_XLOCALE) #error xlocale functionality is not supported in stub locale mode. @@ -51,10 +51,10 @@ libc_hidden_proto(iswctype) #ifdef __UCLIBC_HAS_XLOCALE__ #include -libc_hidden_proto(towlower_l) -libc_hidden_proto(towupper_l) -libc_hidden_proto(towctrans_l) -libc_hidden_proto(iswctype_l) +/* libc_hidden_proto(towlower_l) */ +/* libc_hidden_proto(towupper_l) */ +/* libc_hidden_proto(towctrans_l) */ +/* libc_hidden_proto(iswctype_l) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ /* libc_hidden_proto(__ctype_b) */ #endif /* __UCLIBC_HAS_XLOCALE__ */ @@ -504,7 +504,7 @@ libc_hidden_def(towupper) static const unsigned char typestring[] = __CTYPE_TYPESTRING; /* extern const unsigned char typestring[]; */ -libc_hidden_proto(wctype) +/* libc_hidden_proto(wctype) */ wctype_t wctype(const char *property) { const unsigned char *p; @@ -533,9 +533,9 @@ libc_hidden_def(wctype) #warning REMINDER: Currently wctype_l simply calls wctype. #endif /* __UCLIBC_MJN3_ONLY__ */ -libc_hidden_proto(wctype) +/* libc_hidden_proto(wctype) */ -libc_hidden_proto(wctype_l) +/* libc_hidden_proto(wctype_l) */ wctype_t wctype_l (const char *property, __locale_t locale) { return wctype(property); @@ -907,7 +907,7 @@ libc_hidden_def(towctrans) static const char transstring[] = __CTYPE_TRANSTRING; -libc_hidden_proto(wctrans) +/* libc_hidden_proto(wctrans) */ wctrans_t wctrans(const char *property) { const unsigned char *p; @@ -936,7 +936,7 @@ libc_hidden_def(wctrans) #warning REMINDER: Currently wctrans_l simply calls wctrans. #endif /* __UCLIBC_MJN3_ONLY__ */ -libc_hidden_proto(wctrans) +/* libc_hidden_proto(wctrans) */ wctrans_t wctrans_l(const char *property, __locale_t locale) { diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c index 4fb1aaa48..8167ed685 100644 --- a/libc/misc/wordexp/wordexp.c +++ b/libc/misc/wordexp/wordexp.c @@ -44,19 +44,19 @@ /* Experimentally off - libc_hidden_proto(strndup) */ /* Experimentally off - libc_hidden_proto(strspn) */ /* Experimentally off - libc_hidden_proto(strcspn) */ -libc_hidden_proto(setenv) -libc_hidden_proto(unsetenv) -libc_hidden_proto(waitpid) -libc_hidden_proto(kill) -libc_hidden_proto(getuid) -libc_hidden_proto(getpwnam_r) -libc_hidden_proto(getpwuid_r) -libc_hidden_proto(execve) -libc_hidden_proto(dup2) -libc_hidden_proto(atoi) -libc_hidden_proto(fnmatch) -libc_hidden_proto(pipe) -libc_hidden_proto(fork) +/* libc_hidden_proto(setenv) */ +/* libc_hidden_proto(unsetenv) */ +/* libc_hidden_proto(waitpid) */ +/* libc_hidden_proto(kill) */ +/* libc_hidden_proto(getuid) */ +/* libc_hidden_proto(getpwnam_r) */ +/* libc_hidden_proto(getpwuid_r) */ +/* libc_hidden_proto(execve) */ +/* libc_hidden_proto(dup2) */ +/* libc_hidden_proto(atoi) */ +/* libc_hidden_proto(fnmatch) */ +/* libc_hidden_proto(pipe) */ +/* libc_hidden_proto(fork) */ /* libc_hidden_proto(open) */ /* libc_hidden_proto(close) */ /* libc_hidden_proto(read) */ @@ -65,9 +65,9 @@ libc_hidden_proto(fork) /* libc_hidden_proto(sprintf) */ /* libc_hidden_proto(fprintf) */ /* libc_hidden_proto(abort) */ -libc_hidden_proto(glob) -libc_hidden_proto(globfree) -libc_hidden_proto(wordfree) +/* libc_hidden_proto(glob) */ +/* libc_hidden_proto(globfree) */ +/* libc_hidden_proto(wordfree) */ #ifdef __UCLIBC_HAS_XLOCALE__ /* libc_hidden_proto(__ctype_b_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -- cgit v1.2.3