From 43123f2ccc714bbb4991b538dd70e411899f98e3 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Tue, 3 Jan 2006 17:17:14 +0000 Subject: Get rid of tolower/toupper jump reloc, correct tow* for XLOCALE --- libc/misc/regex/regcomp.c | 2 +- libc/misc/regex/regex_internal.c | 4 ++-- libc/misc/regex/regex_old.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libc/misc/regex') 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 -- cgit v1.2.3