diff options
| author | Tim J. Robbins <tjr@FreeBSD.org> | 2004-07-20 08:27:27 +0000 |
|---|---|---|
| committer | Tim J. Robbins <tjr@FreeBSD.org> | 2004-07-20 08:27:27 +0000 |
| commit | f9ceea9bf17bc8d7b0020c409743f162c3c5eebd (patch) | |
| tree | 7c7db31d3361d73eb1f35c4a144266372f699890 | |
| parent | efd0e5f49e2e41e65ab7c12809bf7e4f99a1af4d (diff) | |
Notes
| -rw-r--r-- | lib/libc/stdio/fgetwc.c | 3 | ||||
| -rw-r--r-- | lib/libc/stdio/fputwc.c | 3 | ||||
| -rw-r--r-- | lib/libc/stdio/ungetwc.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c index d8b10a1e56a9d..719556ad9e1f1 100644 --- a/lib/libc/stdio/fgetwc.c +++ b/lib/libc/stdio/fgetwc.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include "un-namespace.h" #include "libc_private.h" #include "local.h" +#include "mblocal.h" /* * MT-safe version. @@ -70,7 +71,7 @@ __fgetwc(FILE *fp) return (wc); } do { - nconv = mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate); + nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate); if (nconv == (size_t)-1) break; else if (nconv == (size_t)-2) diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c index 3f3984db1f105..0848b74998d1d 100644 --- a/lib/libc/stdio/fputwc.c +++ b/lib/libc/stdio/fputwc.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include "un-namespace.h" #include "libc_private.h" #include "local.h" +#include "mblocal.h" /* * Non-MT-safe version. @@ -55,7 +56,7 @@ __fputwc(wchar_t wc, FILE *fp) *buf = (unsigned char)wc; len = 1; } else { - if ((len = wcrtomb(buf, wc, &fp->_extra->mbstate)) == + if ((len = __wcrtomb(buf, wc, &fp->_extra->mbstate)) == (size_t)-1) { fp->_flags |= __SERR; return (WEOF); diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c index 28f873c53b453..bae2c3ebcea40 100644 --- a/lib/libc/stdio/ungetwc.c +++ b/lib/libc/stdio/ungetwc.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include "un-namespace.h" #include "libc_private.h" #include "local.h" +#include "mblocal.h" /* * Non-MT-safe version. @@ -47,7 +48,7 @@ __ungetwc(wint_t wc, FILE *fp) if (wc == WEOF) return (WEOF); - if ((len = wcrtomb(buf, wc, &fp->_extra->mbstate)) == (size_t)-1) { + if ((len = __wcrtomb(buf, wc, &fp->_extra->mbstate)) == (size_t)-1) { fp->_flags |= __SERR; return (WEOF); } |