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

6 files changed, 24 insertions, 12 deletions

diff --git a/newlib/libc/sys/linux/intl/dcigettext.c b/newlib/libc/sys/linux/intl/dcigettext.c
index 017be4623..de47064aa 100644
--- a/newlib/libc/sys/linux/intl/dcigettext.c
+++ b/newlib/libc/sys/linux/intl/dcigettext.c
@@ -17,7 +17,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifdef MB_CAPABLE
+#include <newlib.h>
+
+#ifdef _MB_CAPABLE
 
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
@@ -1237,7 +1239,7 @@ free_mem (void)
 
 text_set_element (__libc_subfreeres, free_mem);
 #endif
-#else  /* !MB_CAPABLE */
+#else  /* !_MB_CAPABLE */
 
 #include <machine/weakalias.h>
 #include <sys/lock.h>
@@ -1281,4 +1283,4 @@ __dcigettext (domainname, msgid1, msgid2, plural, n, category)
 }
 weak_alias(__dcigettext, dcigettext)
 
-#endif /* !MB_CAPABLE */
+#endif /* !_MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/explodename.c b/newlib/libc/sys/linux/intl/explodename.c
index d36b045bb..6effd3347 100644
--- a/newlib/libc/sys/linux/intl/explodename.c
+++ b/newlib/libc/sys/linux/intl/explodename.c
@@ -1,4 +1,6 @@
-#ifdef MB_CAPABLE
+#include <newlib.h>
+
+#ifdef _MB_CAPABLE
 
 /* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
@@ -201,4 +203,4 @@ _nl_explode_name (name, language, modifier, territory, codeset,
   return mask;
 }
 
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/finddomain.c b/newlib/libc/sys/linux/intl/finddomain.c
index f64305776..4f27790be 100644
--- a/newlib/libc/sys/linux/intl/finddomain.c
+++ b/newlib/libc/sys/linux/intl/finddomain.c
@@ -1,4 +1,6 @@
-#ifdef MB_CAPABLE
+#include <newlib.h>
+
+#ifdef _MB_CAPABLE
 
 /* Handle list of needed message catalogs
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
@@ -217,4 +219,4 @@ free_mem (void)
 text_set_element (__libc_subfreeres, free_mem);
 #endif
 
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/l10nflist.c b/newlib/libc/sys/linux/intl/l10nflist.c
index 1a5cf1e0c..564df73fb 100644
--- a/newlib/libc/sys/linux/intl/l10nflist.c
+++ b/newlib/libc/sys/linux/intl/l10nflist.c
@@ -1,4 +1,6 @@
-#ifdef MB_CAPABLE
+#include <newlib.h>
+
+#ifdef _MB_CAPABLE
 
 /* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
@@ -418,4 +420,4 @@ stpcpy (dest, src)
 }
 #endif
 
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/sys/linux/intl/loadmsgcat.c b/newlib/libc/sys/linux/intl/loadmsgcat.c
index 94f3e9a4c..b5f722e3b 100644
--- a/newlib/libc/sys/linux/intl/loadmsgcat.c
+++ b/newlib/libc/sys/linux/intl/loadmsgcat.c
@@ -1,4 +1,6 @@
-#ifdef MB_CAPABLE 
+#include <newlib.h>
+
+#ifdef _MB_CAPABLE 
 
 /* Load needed message catalogs.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
diff --git a/newlib/libc/sys/linux/intl/localealias.c b/newlib/libc/sys/linux/intl/localealias.c
index 03b6304cc..f3a892342 100644
--- a/newlib/libc/sys/linux/intl/localealias.c
+++ b/newlib/libc/sys/linux/intl/localealias.c
@@ -1,4 +1,6 @@
-#ifdef MB_CAPABLE
+#include <newlib.h>
+
+#ifdef _MB_CAPABLE
 
 /* Handle aliases for locale names.
    Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
@@ -440,4 +442,4 @@ alias_compare (map1, map2)
 #endif
 }
 
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */