diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-11-18 09:49:57 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-11-18 09:49:57 +0000 |
| commit | b4fee5273ece15d709b8e1e7149f92665a24df3e (patch) | |
| tree | e50e4dbfa0e82b5de3e2115b990cb46782f1babd /newlib/libc/stdlib/mbtowc.c | |
| parent | 46471257e90bdc2c46e03a6371a329f8cac34d0c (diff) | |
| download | cygnal-b4fee5273ece15d709b8e1e7149f92665a24df3e.tar.gz cygnal-b4fee5273ece15d709b8e1e7149f92665a24df3e.tar.bz2 cygnal-b4fee5273ece15d709b8e1e7149f92665a24df3e.zip | |
* 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.
Diffstat (limited to 'newlib/libc/stdlib/mbtowc.c')
| -rw-r--r-- | newlib/libc/stdlib/mbtowc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c index 3f34b8a28..83b6a0eda 100644 --- a/newlib/libc/stdlib/mbtowc.c +++ b/newlib/libc/stdlib/mbtowc.c @@ -54,6 +54,7 @@ effects vary with the locale. #include <newlib.h> #include <stdlib.h> #include <wchar.h> +#include "local.h" int _DEFUN (mbtowc, (pwc, s, n), @@ -68,7 +69,7 @@ _DEFUN (mbtowc, (pwc, s, n), _REENT_CHECK_MISC(_REENT); ps = &(_REENT_MBTOWC_STATE(_REENT)); - retval = _mbtowc_r (_REENT, pwc, s, n, ps); + retval = __mbtowc (_REENT, pwc, s, n, __locale_charset (), ps); if (retval < 0) { |