From 766ef9a2cc72c5888a3abe83e63442825bf88920 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Wed, 22 Mar 2006 17:28:37 +0000 Subject: Correct build if UCLIBC_HAS_CTYPE_TABLES is not defined --- libc/inet/addr.c | 2 +- libc/inet/ether_addr.c | 2 +- libc/inet/inet_net.c | 2 +- libc/inet/resolv.c | 2 +- libc/inet/rpc/rcmd.c | 2 +- libc/misc/ctype/ctype.c | 6 +++--- libc/misc/fnmatch/fnmatch.c | 2 +- libc/misc/locale/locale.c | 2 ++ libc/misc/regex/regex.c | 4 +++- libc/misc/time/time.c | 2 +- libc/misc/ttyent/getttyent.c | 2 +- libc/misc/wctype/_wctype.c | 9 ++++++--- libc/misc/wordexp/wordexp.c | 2 +- libc/pwd_grp/pwd_grp.c | 2 +- libc/stdio/_scanf.c | 2 +- libc/stdio/_vfprintf.c | 2 +- libc/stdlib/_strtod.c | 2 +- libc/stdlib/stdlib.c | 4 ++-- libc/string/strcasecmp.c | 2 +- libc/string/strcasestr.c | 6 +++--- libc/string/strncasecmp.c | 2 +- libc/unistd/usershell.c | 2 +- 22 files changed, 35 insertions(+), 28 deletions(-) diff --git a/libc/inet/addr.c b/libc/inet/addr.c index 2603c2165..ba2a022d6 100644 --- a/libc/inet/addr.c +++ b/libc/inet/addr.c @@ -45,7 +45,7 @@ */ #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif libc_hidden_proto(inet_aton) diff --git a/libc/inet/ether_addr.c b/libc/inet/ether_addr.c index 13414826e..e896e707d 100644 --- a/libc/inet/ether_addr.c +++ b/libc/inet/ether_addr.c @@ -37,7 +37,7 @@ libc_hidden_proto(sprintf) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) libc_hidden_proto(__ctype_tolower_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) libc_hidden_proto(__ctype_tolower) #endif diff --git a/libc/inet/inet_net.c b/libc/inet/inet_net.c index 64c6c3e84..f8148c274 100644 --- a/libc/inet/inet_net.c +++ b/libc/inet/inet_net.c @@ -39,7 +39,7 @@ #include #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index 885413db8..0221dbb59 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -202,7 +202,7 @@ libc_hidden_proto(fprintf) libc_hidden_proto(__h_errno_location) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c index 90e30563b..6009d6d31 100644 --- a/libc/inet/rpc/rcmd.c +++ b/libc/inet/rpc/rcmd.c @@ -134,7 +134,7 @@ libc_hidden_proto(__h_errno_location) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) libc_hidden_proto(__ctype_tolower_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) libc_hidden_proto(__ctype_tolower) #endif diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index 243031b6c..d88b342fd 100644 --- a/libc/misc/ctype/ctype.c +++ b/libc/misc/ctype/ctype.c @@ -37,7 +37,7 @@ #include #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif @@ -278,7 +278,7 @@ IS_FUNC_BODY(xdigit); #undef tolower #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_tolower_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_tolower) #endif libc_hidden_proto(tolower) @@ -324,7 +324,7 @@ libc_hidden_def(tolower_l) #undef toupper #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_toupper_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_toupper) #endif libc_hidden_proto(toupper) diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c index 80e5cce8e..2d957772f 100644 --- a/libc/misc/fnmatch/fnmatch.c +++ b/libc/misc/fnmatch/fnmatch.c @@ -66,7 +66,7 @@ libc_hidden_proto(strcoll) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) libc_hidden_proto(__ctype_tolower_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) libc_hidden_proto(__ctype_tolower) #endif diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c index ca69c1cea..b782d5ead 100644 --- a/libc/misc/locale/locale.c +++ b/libc/misc/locale/locale.c @@ -67,7 +67,9 @@ libc_hidden_proto(strcpy) libc_hidden_proto(strncmp) libc_hidden_proto(strchr) libc_hidden_proto(getenv) +#ifdef __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__C_ctype_toupper) +#endif /*libc_hidden_proto(fflush)*/ #ifdef __UCLIBC_MJN3_ONLY__ diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c index 9328f6025..f39492bdf 100644 --- a/libc/misc/regex/regex.c +++ b/libc/misc/regex/regex.c @@ -69,9 +69,11 @@ libc_hidden_proto(wctype) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) libc_hidden_proto(__ctype_toupper_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) libc_hidden_proto(__ctype_toupper) +#else +libc_hidden_proto(isascii) #endif libc_hidden_proto(toupper) libc_hidden_proto(tolower) diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c index e6d96756e..318069b33 100644 --- a/libc/misc/time/time.c +++ b/libc/misc/time/time.c @@ -182,7 +182,7 @@ libc_hidden_proto(strtol_l) libc_hidden_proto(strtoul_l) libc_hidden_proto(nl_langinfo_l) libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c index e9cc9be2a..89c39876f 100644 --- a/libc/misc/ttyent/getttyent.c +++ b/libc/misc/ttyent/getttyent.c @@ -51,7 +51,7 @@ libc_hidden_proto(fclose) libc_hidden_proto(abort) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif diff --git a/libc/misc/wctype/_wctype.c b/libc/misc/wctype/_wctype.c index 84c308a18..0f19cad04 100644 --- a/libc/misc/wctype/_wctype.c +++ b/libc/misc/wctype/_wctype.c @@ -38,9 +38,7 @@ #include libc_hidden_proto(strcmp) -libc_hidden_proto(__C_ctype_tolower) libc_hidden_proto(tolower) -libc_hidden_proto(__C_ctype_toupper) libc_hidden_proto(toupper) libc_hidden_proto(towlower) libc_hidden_proto(towupper) @@ -57,10 +55,15 @@ libc_hidden_proto(towlower_l) libc_hidden_proto(towupper_l) libc_hidden_proto(towctrans_l) libc_hidden_proto(iswctype_l) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ 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) +#endif + /* We know wide char support is enabled. We wouldn't be here otherwise. */ /* Define this if you want to unify the towupper and towlower code in the diff --git a/libc/misc/wordexp/wordexp.c b/libc/misc/wordexp/wordexp.c index 8d2e6e05f..58094dbc7 100644 --- a/libc/misc/wordexp/wordexp.c +++ b/libc/misc/wordexp/wordexp.c @@ -70,7 +70,7 @@ libc_hidden_proto(globfree) libc_hidden_proto(wordfree) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif diff --git a/libc/pwd_grp/pwd_grp.c b/libc/pwd_grp/pwd_grp.c index ef78fed88..1fe7b12c4 100644 --- a/libc/pwd_grp/pwd_grp.c +++ b/libc/pwd_grp/pwd_grp.c @@ -53,7 +53,7 @@ libc_hidden_proto(fclose) libc_hidden_proto(fprintf) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c index bbbcdcc17..a83621681 100644 --- a/libc/stdio/_scanf.c +++ b/libc/stdio/_scanf.c @@ -100,7 +100,7 @@ libc_hidden_proto(fgetwc_unlocked) #endif #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c index d6965ca83..f4bbb1c1e 100644 --- a/libc/stdio/_vfprintf.c +++ b/libc/stdio/_vfprintf.c @@ -732,7 +732,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif diff --git a/libc/stdlib/_strtod.c b/libc/stdlib/_strtod.c index f2cd5e86b..219d0d051 100644 --- a/libc/stdlib/_strtod.c +++ b/libc/stdlib/_strtod.c @@ -177,7 +177,7 @@ extern void __fp_range_check(__fpmax_t y, __fpmax_t x) attribute_hidden; #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) libc_hidden_proto(__ctype_tolower) #endif diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index 61a6da01c..ccd3c015d 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -502,7 +502,7 @@ unsigned long attribute_hidden _stdlib_strto_l(register const Wchar * __restrict #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif @@ -652,7 +652,7 @@ unsigned long long attribute_hidden _stdlib_strto_ll(register const Wchar * __re #else /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */ -#ifndef __UCLIBC_HAS_XLOCALE__ +#if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif /* This is the main work fuction which handles both strtoll (sflag = 1) and diff --git a/libc/string/strcasecmp.c b/libc/string/strcasecmp.c index ac3f562a7..ad4d1aab6 100644 --- a/libc/string/strcasecmp.c +++ b/libc/string/strcasecmp.c @@ -24,7 +24,7 @@ libc_hidden_proto(towlower) libc_hidden_proto(tolower_l) # define TOLOWER(C) tolower_l((C), locale_arg) # else -#ifndef __UCLIBC_HAS_XLOCALE__ +#if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_tolower) #endif libc_hidden_proto(tolower) diff --git a/libc/string/strcasestr.c b/libc/string/strcasestr.c index 72c1e4702..afef59985 100644 --- a/libc/string/strcasestr.c +++ b/libc/string/strcasestr.c @@ -8,10 +8,10 @@ #include "_string.h" #include -#ifndef __UCLIBC_HAS_XLOCALE__ -libc_hidden_proto(__ctype_tolower) -#else +#ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_tolower_loc) +#elif __UCLIBC_HAS_CTYPE_TABLES__ +libc_hidden_proto(__ctype_tolower) #endif libc_hidden_proto(tolower) diff --git a/libc/string/strncasecmp.c b/libc/string/strncasecmp.c index 54de1b78c..0317bc124 100644 --- a/libc/string/strncasecmp.c +++ b/libc/string/strncasecmp.c @@ -24,7 +24,7 @@ libc_hidden_proto(towlower) libc_hidden_proto(tolower_l) # define TOLOWER(C) tolower_l((C), locale_arg) # else -#ifndef __UCLIBC_HAS_XLOCALE__ +#if !defined __UCLIBC_HAS_XLOCALE__ && defined __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_tolower) #endif libc_hidden_proto(tolower) diff --git a/libc/unistd/usershell.c b/libc/unistd/usershell.c index e053d94b7..be8fb71d6 100644 --- a/libc/unistd/usershell.c +++ b/libc/unistd/usershell.c @@ -48,7 +48,7 @@ libc_hidden_proto(fileno) libc_hidden_proto(fgets_unlocked) #ifdef __UCLIBC_HAS_XLOCALE__ libc_hidden_proto(__ctype_b_loc) -#else +#elif __UCLIBC_HAS_CTYPE_TABLES__ libc_hidden_proto(__ctype_b) #endif -- cgit v1.2.3