summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2011-03-09 15:14:48 +0100
committerPeter S. Mazinger <ps.m@gmx.net>2011-03-09 15:14:48 +0100
commit3fa004b7d2d9a3648aa95b093000259a123fa2d8 (patch)
treed4426d826d2b32f671fb97ba3ac08ed4b7b5d964
parentcf67a3699e98c57b3a06e5dd4c7e70baa648db6a (diff)
regcomp.c, aeabi_mb_cur_max.c: use unconditionally MB_CUR_MAX from stdlib.h
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
-rw-r--r--libc/misc/regex/regcomp.c4
-rw-r--r--libc/sysdeps/linux/arm/aeabi_mb_cur_max.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c
index 8f2e18ce4..b25850ccd 100644
--- a/libc/misc/regex/regcomp.c
+++ b/libc/misc/regex/regcomp.c
@@ -819,11 +819,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
dfa->state_hash_mask = table_size - 1;
-#ifdef __UCLIBC_HAS_WCHAR__
dfa->mb_cur_max = MB_CUR_MAX;
-#else
- dfa->mb_cur_max = 1;
-#endif
#if 0
if (dfa->mb_cur_max == 6
&& strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0)
diff --git a/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c b/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c
index f12309eaf..77e979a65 100644
--- a/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c
+++ b/libc/sysdeps/linux/arm/aeabi_mb_cur_max.c
@@ -23,9 +23,5 @@
int
__aeabi_MB_CUR_MAX (void)
{
-#ifdef __UCLIBC_HAS_WCHAR__
return MB_CUR_MAX;
-#else
- return 1;
-#endif
}