diff options
Diffstat (limited to 'libc/misc')
| -rw-r--r-- | libc/misc/fnmatch/fnmatch.c | 2 | ||||
| -rw-r--r-- | libc/misc/fnmatch/fnmatch_old.c | 2 | ||||
| -rw-r--r-- | libc/misc/regex/regcomp.c | 2 | ||||
| -rw-r--r-- | libc/misc/regex/regex_internal.c | 4 | ||||
| -rw-r--r-- | libc/misc/regex/regex_old.c | 2 | ||||
| -rw-r--r-- | libc/misc/wctype/wctype.c | 13 |
6 files changed, 16 insertions, 9 deletions
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c index 8cacc9a88..f1419bfd8 100644 --- a/libc/misc/fnmatch/fnmatch.c +++ b/libc/misc/fnmatch/fnmatch.c @@ -245,7 +245,7 @@ __wcschrnul (s, c) /* Note that this evaluates C many times. */ # if defined _LIBC || defined __UCLIBC__ -# define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c)) +# define FOLD(c) ((flags & FNM_CASEFOLD) ? __tolower (c) : (c)) # else # define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c)) # endif diff --git a/libc/misc/fnmatch/fnmatch_old.c b/libc/misc/fnmatch/fnmatch_old.c index 892738999..384756569 100644 --- a/libc/misc/fnmatch/fnmatch_old.c +++ b/libc/misc/fnmatch/fnmatch_old.c @@ -56,7 +56,7 @@ int attribute_hidden __fnmatch(const char *pattern, const char *string, int flag register char c; /* Note that this evaluates C many times. */ -# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c)) +# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? __tolower (c) : (c)) while ((c = *p++) != '\0') { c = FOLD(c); diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index b15109c93..419d879be 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -292,7 +292,7 @@ re_set_fastmap (char *fastmap, int icase, int ch) { fastmap[ch] = 1; if (icase) - fastmap[tolower (ch)] = 1; + fastmap[__tolower (ch)] = 1; } /* Helper function for re_compile_fastmap. diff --git a/libc/misc/regex/regex_internal.c b/libc/misc/regex/regex_internal.c index f9814d290..c1ee85040 100644 --- a/libc/misc/regex/regex_internal.c +++ b/libc/misc/regex/regex_internal.c @@ -289,7 +289,7 @@ build_wcs_upper_buffer (re_string_t *pstr) { /* In case of a singlebyte character. */ pstr->mbs[byte_idx] - = toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]); + = __toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]); /* The next step uses the assumption that wchar_t is encoded ASCII-safe: all ASCII values can be converted like this. */ pstr->wcs[byte_idx] = (wchar_t) pstr->mbs[byte_idx]; @@ -523,7 +523,7 @@ build_upper_buffer (re_string_t *pstr) if (BE (pstr->trans != NULL, 0)) ch = pstr->trans[ch]; if (islower (ch)) - pstr->mbs[char_idx] = toupper (ch); + pstr->mbs[char_idx] = __toupper (ch); else pstr->mbs[char_idx] = ch; } diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index b995cabfa..9031cebff 100644 --- a/libc/misc/regex/regex_old.c +++ b/libc/misc/regex/regex_old.c @@ -275,7 +275,7 @@ char *realloc (); # ifdef _tolower # define TOLOWER(c) _tolower(c) # else -# define TOLOWER(c) tolower(c) +# define TOLOWER(c) __tolower(c) # endif # ifndef NULL diff --git a/libc/misc/wctype/wctype.c b/libc/misc/wctype/wctype.c index 67b1ca600..659000558 100644 --- a/libc/misc/wctype/wctype.c +++ b/libc/misc/wctype/wctype.c @@ -378,7 +378,9 @@ strong_alias(__towlower_l,towlower_l) #endif /* __LOCALE_C_ONLY */ +#ifndef L_towlower_l strong_alias(__towlower,towlower) +#endif #endif /**********************************************************************/ @@ -484,7 +486,9 @@ strong_alias(__towupper_l,towupper_l) #endif /* __LOCALE_C_ONLY */ +#ifndef L_towupper_l strong_alias(__towupper,towupper) +#endif #endif /**********************************************************************/ @@ -724,11 +728,11 @@ weak_alias(__iswctype, iswctype) #ifndef _tolower #warning _tolower is undefined! -#define _tolower(c) tolower(c) +#define _tolower(c) __tolower(c) #endif #ifndef _toupper #warning _toupper is undefined! -#define _toupper(c) toupper(c) +#define _toupper(c) __toupper(c) #endif wint_t attribute_hidden __towctrans(wint_t wc, wctrans_t desc) @@ -880,10 +884,13 @@ wint_t attribute_hidden TOWCTRANS(wint_t wc, wctrans_t desc) #ifdef L_towctrans_l strong_alias(__towctrans_l, towctrans_l) #endif /* L_towctrans_l */ -strong_alias(__towctrans,towctrans) #endif /* __LOCALE_C_ONLY */ +#ifndef L_towctrans_l +strong_alias(__towctrans,towctrans) +#endif + #endif /**********************************************************************/ #ifdef L_wctrans |