diff options
Diffstat (limited to 'libc/misc')
| -rw-r--r-- | libc/misc/ctype/ctype.c | 6 | ||||
| -rw-r--r-- | libc/misc/fnmatch/fnmatch.c | 2 | ||||
| -rw-r--r-- | libc/misc/locale/locale.c | 2 | ||||
| -rw-r--r-- | libc/misc/regex/regex.c | 4 | ||||
| -rw-r--r-- | libc/misc/time/time.c | 2 | ||||
| -rw-r--r-- | libc/misc/ttyent/getttyent.c | 2 | ||||
| -rw-r--r-- | libc/misc/wctype/_wctype.c | 9 | ||||
| -rw-r--r-- | libc/misc/wordexp/wordexp.c | 2 |
8 files changed, 18 insertions, 11 deletions
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 <locale.h> #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 <bits/uClibc_uwchar.h> 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 |