2004-04-23 Artem B. Bityuckiy <abitytsky@softminecorp.com>

        * 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 <newlib.h>
        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

1 files changed, 7 insertions, 6 deletions

diff --git a/newlib/libc/stdlib/mbstowcs.c b/newlib/libc/stdlib/mbstowcs.c
index cb09f31d0..334b5f54d 100644
--- a/newlib/libc/stdlib/mbstowcs.c
+++ b/newlib/libc/stdlib/mbstowcs.c
@@ -17,13 +17,13 @@ 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 <<mbstowcs>>.  In this case, the
 only ``multi-byte character sequences'' recognized are single bytes,
 and they are ``converted'' to wide-char versions simply by byte
 extension.
 
-When MB_CAPABLE is defined, this routine calls <<_mbstowcs_r>> to perform
+When _MB_CAPABLE is defined, this routine calls <<_mbstowcs_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.
@@ -31,7 +31,7 @@ be restricted to a defined set of locales.
 RETURNS
 This implementation of <<mbstowcs>> returns <<0>> if
 <[s]> is <<NULL>> 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
 multi-byte characters is invalid or incomplete;
 otherwise it returns the minimum of: <<n>> or the
 number of multi-byte characters in <<s>> plus 1 (to
@@ -49,6 +49,7 @@ effects vary with the locale.
 
 #ifndef _REENT_ONLY
 
+#include <newlib.h>
 #include <stdlib.h>
 #include <wchar.h>
 
@@ -58,12 +59,12 @@ _DEFUN (mbstowcs, (pwcs, s, n),
         const char *s _AND
         size_t n)
 {
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   mbstate_t state;
   state.__count = 0;
   
   return _mbstowcs_r (_REENT, pwcs, s, n, &state);
-#else /* not MB_CAPABLE */
+#else /* not _MB_CAPABLE */
   
   int count = 0;
   
@@ -76,7 +77,7 @@ _DEFUN (mbstowcs, (pwcs, s, n),
   }
   
   return count;
-#endif /* not MB_CAPABLE */
+#endif /* not _MB_CAPABLE */
 }
 
 #endif /* !_REENT_ONLY */