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/mbstowcs_r.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'newlib/libc/stdlib/mbstowcs_r.c') diff --git a/newlib/libc/stdlib/mbstowcs_r.c b/newlib/libc/stdlib/mbstowcs_r.c index 3dd73e4..3ba8677 100644 --- a/newlib/libc/stdlib/mbstowcs_r.c +++ b/newlib/libc/stdlib/mbstowcs_r.c @@ -1,5 +1,6 @@ #include #include +#include "local.h" size_t _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state), @@ -17,7 +18,7 @@ _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state), n = (size_t) 1; /* Value doesn't matter as long as it's not 0. */ while (n > 0) { - bytes = _mbtowc_r (r, pwcs, t, MB_CUR_MAX, state); + bytes = __mbtowc (r, pwcs, t, MB_CUR_MAX, __locale_charset (), state); if (bytes < 0) { state->__count = 0; -- cgit v1.1