From f777e3a5ac5d2fda9047dc2b7939d3f60bdef609 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Fri, 23 Apr 2004 21:44:22 +0000 Subject: 2004-04-23 Artem B. Bityuckiy * configure.in: Define _MB_CAPABLE if mb supported. * configure: Regenerated. * configure.host: Remove manual setting of MB_CAPABLE compiler flag. * newlib.hin: Add _MB_CAPABLE flag. * libc/ctype/iswalpha.c, libc/ctype/iswblank.c: Include and check for _MB_CAPABLE flag instead of MB_CAPABLE. * libc/ctype/iswcntrl.c, libc/ctype/iswprint.c: Ditto. * libc/ctype/iswpunct.c, libc/ctype/iswspace.c: Ditto. * libc/ctype/jp2uc.c: Ditto. * libc/ctype/towlower.c, libc/ctype/towupper.c: Ditto. * libc/locale/locale.c: Ditto * libc/machine/powerpc/vfscanf.c: Ditto * libc/stdio/vfprintf.c, libc/stdio/vfscanf.c: Ditto * libc/stdlib/mblen.c: Ditto * libc/stdlib/mblen_r.c, libc/stdlib/mbrlen.c: Ditto * libc/stdlib/mbrtowc.c, libc/stdlib/mbsrtowcs.c: Ditto * libc/stdlib/mbstowcs.c, libc/stdlib/mbtowc.c: Ditto * libc/stdlib/mbtowc_r.c, libc/stdlib/wcrtomb.c: Ditto * libc/stdlib/wcsrtombs.c, libc/stdlib/wcstombs.c: Ditto * libc/stdlib/wctomb.c, libc/sys/linux/intl/dcigettext.c: Ditto * libc/sys/linux/intl/explodename.c: Ditto * libc/sys/linux/intl/finddomain.c: Ditto * libc/sys/linux/intl/l10nflist.c: Ditto * libc/sys/linux/intl/loadmsgcat.c: Ditto * libc/sys/linux/intl/localealias.c: Ditto --- newlib/libc/stdlib/wcstombs.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'newlib/libc/stdlib/wcstombs.c') diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c index f02d4ab1f..83e48da93 100644 --- a/newlib/libc/stdlib/wcstombs.c +++ b/newlib/libc/stdlib/wcstombs.c @@ -17,12 +17,12 @@ TRAD_SYNOPSIS size_t <[n]>; DESCRIPTION -When MB_CAPABLE is not defined, this is a minimal ANSI-conforming +When _MB_CAPABLE is not defined, this is a minimal ANSI-conforming implementation of <>. In this case, all wide-characters are expected to represent single bytes and so are converted simply by casting to char. -When MB_CAPABLE is defined, this routine calls <<_wcstombs_r>> to perform +When _MB_CAPABLE is defined, this routine calls <<_wcstombs_r>> to perform the conversion, passing a state variable to allow state dependent decoding. The result is based on the locale setting which may be restricted to a defined set of locales. @@ -30,7 +30,7 @@ be restricted to a defined set of locales. RETURNS This implementation of <> returns <<0>> if <[s]> is <> or is the empty string; -it returns <<-1>> if MB_CAPABLE and one of the +it returns <<-1>> if _MB_CAPABLE and one of the wide-char characters does not represent a valid multi-byte character; otherwise it returns the minimum of: <> or the number of bytes that are transferred to <>, not including the @@ -50,6 +50,7 @@ effects vary with the locale. #ifndef _REENT_ONLY +#include #include #include @@ -59,12 +60,12 @@ _DEFUN (wcstombs, (s, pwcs, n), const wchar_t *pwcs _AND size_t n) { -#ifdef MB_CAPABLE +#ifdef _MB_CAPABLE mbstate_t state; state.__count = 0; return _wcstombs_r (_REENT, s, pwcs, n, &state); -#else /* not MB_CAPABLE */ +#else /* not _MB_CAPABLE */ int count = 0; if (n != 0) { @@ -76,7 +77,7 @@ _DEFUN (wcstombs, (s, pwcs, n), } return count; -#endif /* not MB_CAPABLE */ +#endif /* not _MB_CAPABLE */ } #endif /* !_REENT_ONLY */ -- cgit v1.2.3