From 255fb838c8d0ad983aec17c6fd6fd779589d19eb Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Fri, 16 Dec 2005 12:35:43 +0000 Subject: Macros are no good for jump relocs, hack to get rid of one introduced my new regex code --- libc/misc/regex/regcomp.c | 3 +++ libc/stdlib/stdlib.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index 9d6c78cda..b15109c93 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -834,6 +834,9 @@ init_dfa (re_dfa_t *dfa, size_t pat_len) dfa->state_hash_mask = table_size - 1; #ifdef __UCLIBC_HAS_WCHAR__ +# undef MB_CUR_MAX +# define MB_CUR_MAX (_stdlib_mb_cur_max_internal ()) +extern size_t _stdlib_mb_cur_max_internal (void) __THROW __wur attribute_hidden; dfa->mb_cur_max = MB_CUR_MAX; #else dfa->mb_cur_max = 1; diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index ab95c9378..8203881a4 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -868,7 +868,7 @@ void ssort (void *base, /**********************************************************************/ #ifdef L__stdlib_mb_cur_max -size_t _stdlib_mb_cur_max(void) +size_t attribute_hidden _stdlib_mb_cur_max_internal(void) { #ifdef __CTYPE_HAS_UTF_8_LOCALES return __UCLIBC_CURLOCALE_DATA.mb_cur_max; @@ -881,6 +881,7 @@ size_t _stdlib_mb_cur_max(void) return 1; #endif } +strong_alias(_stdlib_mb_cur_max_internal,_stdlib_mb_cur_max) #endif /**********************************************************************/ -- cgit v1.2.3