From b4fee5273ece15d709b8e1e7149f92665a24df3e Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 18 Nov 2009 09:49:57 +0000 Subject: * libc/stdio/vfprintf.c: Include ../stdlib/local.h. Replace call to _mbtowc_r with direct call to __mbtowc. * libc/stdio/vfscanf.c: Ditto. * libc/stdlib/btowc.c: Include local.h. Replace call to _mbtowc_r with direct call to __mbtowc. * libc/stdlib/mblen.c: Ditto. * libc/stdlib/mblen_r.c: Ditto. * libc/stdlib/mbrtowc.c: Ditto. * libc/stdlib/mbstowcs_r.c: Ditto. * libc/stdlib/mbtowc.c: Ditto. * libc/stdlib/wcrtomb.c: Include local.h. Replace call to _wctomb_r with direct call to __wctomb. * libc/stdlib/wcsnrtombs.c: Ditto. (_wcsnrtombs_r): Ditto. * libc/stdlib/wcstombs_r.c: Ditto. * libc/stdlib/wctob.c: Ditto. * libc/stdlib/wctomb.c: Ditto. * libc/stdlib/mbrtowc.c (mbrtowc): Implement independently from _mbrtowc_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are defined. * libc/stdlib/wcrtomb.c (wcrtomb): Implement independently from _wcrtomb_r, unless PREFER_SIZE_OVER_SPEED or __OPTIMIZE_SIZE__ are defined. * libc/stdlib/mbtowc_r.c (__utf8_mbtowc): Drop unnecessary test for ch >= 0. --- newlib/libc/stdlib/mblen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'newlib/libc/stdlib/mblen.c') diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c index 6df27b9..ace2388 100644 --- a/newlib/libc/stdlib/mblen.c +++ b/newlib/libc/stdlib/mblen.c @@ -46,6 +46,7 @@ effects vary with the locale. #include #include #include +#include "local.h" int _DEFUN (mblen, (s, n), @@ -58,7 +59,7 @@ _DEFUN (mblen, (s, n), _REENT_CHECK_MISC(_REENT); state = &(_REENT_MBLEN_STATE(_REENT)); - retval = _mbtowc_r (_REENT, NULL, s, n, state); + retval = __mbtowc (_REENT, NULL, s, n, __locale_charset (), state); if (retval < 0) { state->__count = 0; -- cgit v1.1