diff options
Diffstat (limited to 'newlib/libc/stdio')
| -rw-r--r-- | newlib/libc/stdio/vfprintf.c | 7 | ||||
| -rw-r--r-- | newlib/libc/stdio/vfscanf.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c index 1d3119b4d..773485885 100644 --- a/newlib/libc/stdio/vfprintf.c +++ b/newlib/libc/stdio/vfprintf.c @@ -159,6 +159,7 @@ static char *rcsid = "$Id$"; #include <sys/lock.h> #include <stdarg.h> #include "local.h" +#include "../stdlib/local.h" #include "fvwrite.h" #include "vfieeefp.h" @@ -722,7 +723,8 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap), for (;;) { cp = fmt; #ifdef _MB_CAPABLE - while ((n = _mbtowc_r (data, &wc, fmt, MB_CUR_MAX, &state)) > 0) { + while ((n = __mbtowc (data, &wc, fmt, MB_CUR_MAX, + __locale_charset (), &state)) > 0) { if (wc == '%') break; fmt += n; @@ -1794,7 +1796,8 @@ _DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt), while (*fmt && n >= numargs) { # ifdef _MB_CAPABLE - while ((nbytes = _mbtowc_r (data, &wc, fmt, MB_CUR_MAX, &wc_state)) > 0) + while ((nbytes = __mbtowc (data, &wc, fmt, MB_CUR_MAX, + __locale_charset (), &wc_state)) > 0) { fmt += nbytes; if (wc == '%') diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c index b24c9fb84..065dc3e89 100644 --- a/newlib/libc/stdio/vfscanf.c +++ b/newlib/libc/stdio/vfscanf.c @@ -122,6 +122,7 @@ Supporting OS subroutines required: #include <stdarg.h> #include <errno.h> #include "local.h" +#include "../stdlib/local.h" #ifdef INTEGER_ONLY #define VFSCANF vfiscanf @@ -506,7 +507,8 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap), wc = *fmt; #else memset (&state, '\0', sizeof (state)); - nbytes = _mbtowc_r (rptr, &wc, fmt, MB_CUR_MAX, &state); + nbytes = __mbtowc (rptr, &wc, fmt, MB_CUR_MAX, __locale_charset (), + &state); #endif fmt += nbytes; if (wc == 0) |