From 933df87e4e9a8d7f6901dd0417b0006c5b132439 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 18 Nov 2008 01:10:26 +0000 Subject: libc_hidden_proto removal, a few more functions --- libc/misc/assert/__assert.c | 2 +- libc/misc/ctype/ctype.c | 24 ++++++++++++------------ libc/misc/error/err.c | 2 +- libc/misc/error/error.c | 2 +- libc/misc/fnmatch/fnmatch.c | 8 ++++---- libc/misc/locale/locale.c | 10 +++++----- libc/misc/mntent/mntent.c | 4 ++-- libc/misc/regex/regex.c | 6 +++--- libc/misc/time/time.c | 4 ++-- libc/misc/ttyent/getttyent.c | 6 +++--- libc/misc/wctype/_wctype.c | 6 +++--- libc/misc/wordexp/wordexp.c | 6 +++--- 12 files changed, 40 insertions(+), 40 deletions(-) (limited to 'libc/misc') diff --git a/libc/misc/assert/__assert.c b/libc/misc/assert/__assert.c index f25cd184b..d00cdfac9 100644 --- a/libc/misc/assert/__assert.c +++ b/libc/misc/assert/__assert.c @@ -32,7 +32,7 @@ #include #include -libc_hidden_proto(fprintf) +/* libc_hidden_proto(fprintf) */ /* libc_hidden_proto(abort) */ /* Get the prototype from assert.h as a double-check. */ diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index 8afaab3b0..fc779448e 100644 --- a/libc/misc/ctype/ctype.c +++ b/libc/misc/ctype/ctype.c @@ -36,9 +36,9 @@ #include #include #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_XLOCALE__ @@ -161,7 +161,7 @@ int CTYPE_NAME(NAME) (int c) \ #ifdef L___ctype_assert #ifdef __UCLIBC_HAS_CTYPE_ENFORCED__ -libc_hidden_proto(fprintf) +/* libc_hidden_proto(fprintf) */ /* libc_hidden_proto(abort) */ attribute_hidden void __isctype_assert(int c, int mask) @@ -277,9 +277,9 @@ IS_FUNC_BODY(xdigit); #undef tolower #ifdef __UCLIBC_HAS_XLOCALE__ -libc_hidden_proto(__ctype_tolower_loc) +/* libc_hidden_proto(__ctype_tolower_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -libc_hidden_proto(__ctype_tolower) +/* libc_hidden_proto(__ctype_tolower) */ #endif libc_hidden_proto(tolower) #ifdef __UCLIBC_HAS_CTYPE_TABLES__ @@ -324,7 +324,7 @@ weak_alias (tolower_l, __tolower_l) #undef toupper #ifdef __UCLIBC_HAS_XLOCALE__ -libc_hidden_proto(__ctype_toupper_loc) +/* libc_hidden_proto(__ctype_toupper_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_toupper) #endif @@ -440,7 +440,7 @@ libc_hidden_def(__ctype_b_loc) #ifdef __UCLIBC_HAS_XLOCALE__ -libc_hidden_proto(__ctype_tolower_loc) +/* libc_hidden_proto(__ctype_tolower_loc) */ const __ctype_touplow_t **__ctype_tolower_loc(void) { return &(__UCLIBC_CURLOCALE_DATA).__ctype_tolower; @@ -455,7 +455,7 @@ libc_hidden_def(__ctype_tolower_loc) #ifdef __UCLIBC_HAS_XLOCALE__ -libc_hidden_proto(__ctype_toupper_loc) +/* libc_hidden_proto(__ctype_toupper_loc) */ const __ctype_touplow_t **__ctype_toupper_loc(void) { return &(__UCLIBC_CURLOCALE_DATA).__ctype_toupper; @@ -860,7 +860,7 @@ const __ctype_mask_t __C_ctype_b_data[] = { }; libc_hidden_data_def(__C_ctype_b_data) -libc_hidden_proto(__C_ctype_b) +/* libc_hidden_proto(__C_ctype_b) */ const __ctype_mask_t *__C_ctype_b = __C_ctype_b_data + __UCLIBC_CTYPE_B_TBL_OFFSET; libc_hidden_data_def(__C_ctype_b) @@ -979,14 +979,14 @@ const __ctype_touplow_t __C_ctype_tolower_data[] = { }; libc_hidden_data_def(__C_ctype_tolower_data) -libc_hidden_proto(__C_ctype_tolower) +/* libc_hidden_proto(__C_ctype_tolower) */ 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) +/* libc_hidden_proto(__ctype_tolower) */ const __ctype_touplow_t *__ctype_tolower = __C_ctype_tolower_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; libc_hidden_data_def(__ctype_tolower) @@ -1101,7 +1101,7 @@ const __ctype_touplow_t __C_ctype_toupper_data[] = { }; libc_hidden_data_def(__C_ctype_toupper_data) -libc_hidden_proto(__C_ctype_toupper) +/* libc_hidden_proto(__C_ctype_toupper) */ const __ctype_touplow_t *__C_ctype_toupper = __C_ctype_toupper_data + __UCLIBC_CTYPE_TO_TBL_OFFSET; libc_hidden_data_def(__C_ctype_toupper) diff --git a/libc/misc/error/err.c b/libc/misc/error/err.c index ce20003f5..517e08630 100644 --- a/libc/misc/error/err.c +++ b/libc/misc/error/err.c @@ -26,7 +26,7 @@ libc_hidden_proto(vwarnx) libc_hidden_proto(verr) libc_hidden_proto(verrx) -libc_hidden_proto(fprintf) +/* libc_hidden_proto(fprintf) */ libc_hidden_proto(vfprintf) libc_hidden_proto(__xpg_strerror_r) /* libc_hidden_proto(exit) */ diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c index fa3f3c4ab..c0f8f8d0a 100644 --- a/libc/misc/error/error.c +++ b/libc/misc/error/error.c @@ -28,7 +28,7 @@ /* Experimentally off - libc_hidden_proto(strcmp) */ /* Experimentally off - libc_hidden_proto(strerror) */ -libc_hidden_proto(fprintf) +/* libc_hidden_proto(fprintf) */ /* libc_hidden_proto(exit) */ libc_hidden_proto(putc) libc_hidden_proto(vfprintf) diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c index 8592d4cf6..351abaf73 100644 --- a/libc/misc/fnmatch/fnmatch.c +++ b/libc/misc/fnmatch/fnmatch.c @@ -65,11 +65,11 @@ /* Experimentally off - libc_hidden_proto(strlen) */ /* Experimentally off - libc_hidden_proto(strcoll) */ #ifdef __UCLIBC_HAS_XLOCALE__ -libc_hidden_proto(__ctype_b_loc) -libc_hidden_proto(__ctype_tolower_loc) +/* libc_hidden_proto(__ctype_b_loc) */ +/* libc_hidden_proto(__ctype_tolower_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -libc_hidden_proto(__ctype_b) -libc_hidden_proto(__ctype_tolower) +/* libc_hidden_proto(__ctype_b) */ +/* libc_hidden_proto(__ctype_tolower) */ #endif libc_hidden_proto(tolower) libc_hidden_proto(fnmatch) diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c index df29ce730..d8c539728 100644 --- a/libc/misc/locale/locale.c +++ b/libc/misc/locale/locale.c @@ -68,7 +68,7 @@ /* Experimentally off - libc_hidden_proto(strchr) */ libc_hidden_proto(getenv) #ifdef __UCLIBC_HAS_CTYPE_TABLES__ -libc_hidden_proto(__C_ctype_toupper) +/* libc_hidden_proto(__C_ctype_toupper) */ #endif /*libc_hidden_proto(fflush)*/ @@ -364,11 +364,11 @@ libc_hidden_def(localeconv) /**********************************************************************/ #if defined(L__locale_init) && !defined(__LOCALE_C_ONLY) -libc_hidden_proto(__C_ctype_b) -libc_hidden_proto(__C_ctype_tolower) +/* libc_hidden_proto(__C_ctype_b) */ +/* libc_hidden_proto(__C_ctype_tolower) */ #ifndef __UCLIBC_HAS_XLOCALE__ -libc_hidden_proto(__ctype_b) -libc_hidden_proto(__ctype_tolower) +/* libc_hidden_proto(__ctype_b) */ +/* libc_hidden_proto(__ctype_tolower) */ libc_hidden_proto(__ctype_toupper) #endif diff --git a/libc/misc/mntent/mntent.c b/libc/misc/mntent/mntent.c index 22acbdd5e..a81a877bf 100644 --- a/libc/misc/mntent/mntent.c +++ b/libc/misc/mntent/mntent.c @@ -20,11 +20,11 @@ libc_hidden_proto(endmntent) /* Experimentally off - libc_hidden_proto(strtok_r) */ libc_hidden_proto(atoi) libc_hidden_proto(fopen) -libc_hidden_proto(fclose) +/* libc_hidden_proto(fclose) */ libc_hidden_proto(fseek) libc_hidden_proto(fgets) /* libc_hidden_proto(abort) */ -libc_hidden_proto(fprintf) +/* libc_hidden_proto(fprintf) */ /* Reentrant version of getmntent. */ struct mntent *getmntent_r (FILE *filep, diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c index cf0ed62b7..80c95bba1 100644 --- a/libc/misc/regex/regex.c +++ b/libc/misc/regex/regex.c @@ -67,10 +67,10 @@ libc_hidden_proto(wctype) #endif #define __mempcpy mempcpy #ifdef __UCLIBC_HAS_XLOCALE__ -libc_hidden_proto(__ctype_b_loc) -libc_hidden_proto(__ctype_toupper_loc) +/* libc_hidden_proto(__ctype_b_loc) */ +/* libc_hidden_proto(__ctype_toupper_loc) */ #elif defined __UCLIBC_HAS_CTYPE_TABLES__ -libc_hidden_proto(__ctype_b) +/* libc_hidden_proto(__ctype_b) */ libc_hidden_proto(__ctype_toupper) #else libc_hidden_proto(isascii) diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index a53580911..13d62ad1b 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -183,9 +183,9 @@ libc_hidden_proto(nl_langinfo) libc_hidden_proto(strtol_l) libc_hidden_proto(strtoul_l) libc_hidden_proto(nl_langinfo_l) -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 #ifndef __isleap diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c index fb2b88591..059835d2e 100644 --- a/libc/misc/ttyent/getttyent.c +++ b/libc/misc/ttyent/getttyent.c @@ -47,12 +47,12 @@ 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(fclose) */ /* libc_hidden_proto(abort) */ #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 static char zapchar; diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c index 25419b500..5dd9a0764 100644 --- a/libc/misc/wctype/_wctype.c +++ b/libc/misc/wctype/_wctype.c @@ -56,12 +56,12 @@ 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) +/* libc_hidden_proto(__ctype_b) */ #endif /* __UCLIBC_HAS_XLOCALE__ */ #ifdef __UCLIBC_HAS_CTYPE_TABLES__ -libc_hidden_proto(__C_ctype_tolower) -libc_hidden_proto(__C_ctype_toupper) +/* libc_hidden_proto(__C_ctype_tolower) */ +/* libc_hidden_proto(__C_ctype_toupper) */ #endif /* We know wide char support is enabled. We wouldn't be here otherwise. */ diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c index cfddcba5c..05a2f0b46 100644 --- a/libc/misc/wordexp/wordexp.c +++ b/libc/misc/wordexp/wordexp.c @@ -63,15 +63,15 @@ libc_hidden_proto(read) libc_hidden_proto(getenv) libc_hidden_proto(getpid) libc_hidden_proto(sprintf) -libc_hidden_proto(fprintf) +/* libc_hidden_proto(fprintf) */ /* libc_hidden_proto(abort) */ libc_hidden_proto(glob) libc_hidden_proto(globfree) libc_hidden_proto(wordfree) #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 #define __WORDEXP_FULL -- cgit v1.2.3