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/mblen_r.c b/newlib/libc/stdlib/mblen_r.c
index 1d6659743..9361f6573 100644
--- a/newlib/libc/stdlib/mblen_r.c
+++ b/newlib/libc/stdlib/mblen_r.c
@@ -18,20 +18,20 @@ TRAD_SYNOPSIS
         int *<[state]>;
 
 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 <<_mblen_r>>.  In this case, the
 only ``multi-byte character sequences'' recognized are single bytes,
 and thus <<1>> is returned unless <[s]> is the null pointer or
 has a length of 0 or is the empty string.
 
-When MB_CAPABLE is defined, this routine calls <<_mbtowc_r>> to perform
+When _MB_CAPABLE is defined, this routine calls <<_mbtowc_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.
 
 RETURNS
 This implementation of <<_mblen_r>> returns <<0>> if
-<[s]> is <<NULL>> or the empty string; it returns <<1>> if not MB_CAPABLE or
+<[s]> is <<NULL>> or the empty string; it returns <<1>> if not _MB_CAPABLE or
 the character is a single-byte character; it returns <<-1>>
 if the multi-byte character is invalid; otherwise it returns
 the number of bytes in the multibyte character.
@@ -43,6 +43,7 @@ effects vary with the locale.
 <<_mblen_r>> requires no supporting OS subroutines.
 */
 
+#include <newlib.h>
 #include <stdlib.h>
 #include <wchar.h>
 
@@ -53,7 +54,7 @@ _DEFUN (_mblen_r, (r, s, n, state),
         size_t n _AND
         mbstate_t *state)
 {
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   int retval;
   retval = _mbtowc_r (r, NULL, s, n, state);
 
@@ -64,12 +65,12 @@ _DEFUN (_mblen_r, (r, s, n, state),
     }
 
   return retval;
-#else /* not MB_CAPABLE */
+#else /* not _MB_CAPABLE */
   if (s == NULL || *s == '\0')
     return 0;
   if (n == 0)
     return -1;
   return 1;
-#endif /* not MB_CAPABLE */
+#endif /* not _MB_CAPABLE */
 }