[git commit prelink] regcomp.c, aeabi_mb_cur_max.c: use unconditionally MB_CUR_MAX from stdlib.h

Peter S. Mazinger ps.m at gmx.net
Wed Mar 30 11:53:36 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=3fa004b7d2d9a3648aa95b093000259a123fa2d8
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 libc/misc/regex/regcomp.c                 |    4 ----
 libc/sysdeps/linux/arm/aeabi_mb_cur_max.c |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c
index 8f2e18c..b25850c 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 f12309e..77e979a 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
 }
-- 
1.7.3.4



More information about the uClibc-cvs mailing list