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

9 files changed, 34 insertions, 24 deletions

diff --git a/newlib/libc/ctype/iswalpha.c b/newlib/libc/ctype/iswalpha.c
index 97fda7f17..0e987a992 100644
--- a/newlib/libc/ctype/iswalpha.c
+++ b/newlib/libc/ctype/iswalpha.c
@@ -56,14 +56,15 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 #include <_ansi.h>
+#include <newlib.h>
 #include <wctype.h>
 #include <string.h>
 #include <ctype.h>
 #include "local.h"
 
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
 #include "utf8alpha.h"
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
 int
 _DEFUN(iswalpha,(c), wint_t c)
@@ -74,7 +75,7 @@ _DEFUN(iswalpha,(c), wint_t c)
       unicode = 0;
       /* fall-through */ 
     }
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   else if (!strcmp (__lc_ctype, "C-JIS"))
     {
       c = __jp2uc (c, JP_JIS);
@@ -335,7 +336,7 @@ _DEFUN(iswalpha,(c), wint_t c)
       /* not in table */
       return 0;
     }
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
   return (c < (wint_t)0x100 ? isalpha (c) : 0);
 }
diff --git a/newlib/libc/ctype/iswblank.c b/newlib/libc/ctype/iswblank.c
index 8834e954d..b10756d5e 100644
--- a/newlib/libc/ctype/iswblank.c
+++ b/newlib/libc/ctype/iswblank.c
@@ -56,6 +56,7 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 #include <_ansi.h>
+#include <newlib.h>
 #include <wctype.h>
 #include <ctype.h>
 #include <string.h>
@@ -70,7 +71,7 @@ _DEFUN(iswblank,(c), wint_t c)
       unicode = 0;
       /* fall-through */ 
     }
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   else if (!strcmp (__lc_ctype, "C-JIS"))
     {
       c = __jp2uc (c, JP_JIS);
@@ -98,7 +99,7 @@ _DEFUN(iswblank,(c), wint_t c)
               (c >= 0x2008 && c <= 0x200b) ||
               c == 0x205f || c == 0x3000);
     }
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
   return (c < 0x100 ? isblank (c) : 0);
 }
diff --git a/newlib/libc/ctype/iswcntrl.c b/newlib/libc/ctype/iswcntrl.c
index b33af01ee..d09295225 100644
--- a/newlib/libc/ctype/iswcntrl.c
+++ b/newlib/libc/ctype/iswcntrl.c
@@ -56,6 +56,7 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 #include <_ansi.h>
+#include <newlib.h>
 #include <wctype.h>
 #include <ctype.h>
 #include <string.h>
@@ -70,7 +71,7 @@ _DEFUN(iswcntrl,(c), wint_t c)
       unicode = 0;
       /* fall-through */ 
     }
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   else if (!strcmp (__lc_ctype, "C-JIS"))
     {
       c = __jp2uc (c, JP_JIS);
@@ -97,7 +98,7 @@ _DEFUN(iswcntrl,(c), wint_t c)
               (c >= 0x007f && c <= 0x009f) ||
               c == 0x2028 || c == 0x2029);
     }
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
   return (c < 0x100 ? iscntrl (c) : 0);
 }
diff --git a/newlib/libc/ctype/iswprint.c b/newlib/libc/ctype/iswprint.c
index 5acba9cd7..f4ec08752 100644
--- a/newlib/libc/ctype/iswprint.c
+++ b/newlib/libc/ctype/iswprint.c
@@ -56,14 +56,15 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 #include <_ansi.h>
+#include <newlib.h>
 #include <wctype.h>
 #include <string.h>
 #include <ctype.h>
 #include "local.h"
 
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
 #include "utf8print.h"
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
 int
 _DEFUN(iswprint,(c), wint_t c)
@@ -74,7 +75,7 @@ _DEFUN(iswprint,(c), wint_t c)
       unicode = 0;
       /* fall-through */ 
     }
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   else if (!strcmp (__lc_ctype, "C-JIS"))
     {
       c = __jp2uc (c, JP_JIS);
@@ -390,7 +391,7 @@ _DEFUN(iswprint,(c), wint_t c)
       /* not in table */
       return 0;
     }
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
   return (c < (wint_t)0x100 ? isprint (c) : 0);
 }
diff --git a/newlib/libc/ctype/iswpunct.c b/newlib/libc/ctype/iswpunct.c
index 716fe5f62..88442b6ca 100644
--- a/newlib/libc/ctype/iswpunct.c
+++ b/newlib/libc/ctype/iswpunct.c
@@ -56,14 +56,15 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 #include <_ansi.h>
+#include <newlib.h>
 #include <wctype.h>
 #include <string.h>
 #include <ctype.h>
 #include "local.h"
 
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
 #include "utf8punct.h"
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
 int
 _DEFUN(iswpunct,(c), wint_t c)
@@ -74,7 +75,7 @@ _DEFUN(iswpunct,(c), wint_t c)
       unicode = 0;
       /* fall-through */ 
     }
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   else if (!strcmp (__lc_ctype, "C-JIS"))
     {
       c = __jp2uc (c, JP_JIS);
@@ -325,7 +326,7 @@ _DEFUN(iswpunct,(c), wint_t c)
       /* not in table */
       return 0;
     }
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
   return (c < (wint_t)0x100 ? ispunct (c) : 0);
 }
diff --git a/newlib/libc/ctype/iswspace.c b/newlib/libc/ctype/iswspace.c
index cd3d85a7c..f4d0a0b91 100644
--- a/newlib/libc/ctype/iswspace.c
+++ b/newlib/libc/ctype/iswspace.c
@@ -56,6 +56,7 @@ PORTABILITY
 No supporting OS subroutines are required.
 */
 #include <_ansi.h>
+#include <newlib.h>
 #include <wctype.h>
 #include <ctype.h>
 #include <string.h>
@@ -70,7 +71,7 @@ _DEFUN(iswspace,(c), wint_t c)
       unicode = 0;
       /* fall-through */ 
     }
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   else if (!strcmp (__lc_ctype, "C-JIS"))
     {
       c = __jp2uc (c, JP_JIS);
@@ -99,7 +100,7 @@ _DEFUN(iswspace,(c), wint_t c)
               c == 0x2028 || c == 0x2029 ||
               c == 0x205f || c == 0x3000);
     }
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
 
   return (c < 0x100 ? isspace (c) : 0);
 }
diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
index 044c76b86..9d26a7a68 100644
--- a/newlib/libc/ctype/jp2uc.c
+++ b/newlib/libc/ctype/jp2uc.c
@@ -29,7 +29,9 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifdef MB_CAPABLE
+#include <newlib.h>
+
+#ifdef _MB_CAPABLE
 
 #include <_ansi.h>
 #include <wctype.h>
@@ -140,4 +142,4 @@ _DEFUN (__jp2uc, (c, type), wint_t c _AND int type)
   return WEOF; 
 }
 
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
diff --git a/newlib/libc/ctype/towlower.c b/newlib/libc/ctype/towlower.c
index a0b03b8c5..5c36a31a6 100644
--- a/newlib/libc/ctype/towlower.c
+++ b/newlib/libc/ctype/towlower.c
@@ -59,6 +59,7 @@ No supporting OS subroutines are required.
 */
 
 #include <_ansi.h>
+#include <newlib.h>
 #include <string.h>
 #include <reent.h>
 #include <ctype.h>
@@ -75,7 +76,7 @@ _DEFUN(towlower,(c), wint_t c)
       unicode = 0;
       /* fall-through */ 
     }
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   else if (!strcmp (__lc_ctype, "C-JIS"))
     {
       c = __jp2uc (c, JP_JIS);
@@ -471,7 +472,7 @@ _DEFUN(towlower,(c), wint_t c)
 	    return 0x00e5;
 	}
     }     
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
   
   return (c < 0x00ff ? (wint_t)(tolower ((int)c)) : c);
 }
diff --git a/newlib/libc/ctype/towupper.c b/newlib/libc/ctype/towupper.c
index b14e5aa07..530aebf3a 100644
--- a/newlib/libc/ctype/towupper.c
+++ b/newlib/libc/ctype/towupper.c
@@ -59,6 +59,7 @@ No supporting OS subroutines are required.
 */
 
 #include <_ansi.h>
+#include <newlib.h>
 #include <string.h>
 #include <reent.h>
 #include <ctype.h>
@@ -75,7 +76,7 @@ _DEFUN(towupper,(c), wint_t c)
       unicode = 0;
       /* fall-through */ 
     }
-#ifdef MB_CAPABLE
+#ifdef _MB_CAPABLE
   else if (!strcmp (__lc_ctype, "C-JIS"))
     {
       c = __jp2uc (c, JP_JIS);
@@ -498,7 +499,7 @@ _DEFUN(towupper,(c), wint_t c)
 	    return (c - 0x28);
 	}
     }     
-#endif /* MB_CAPABLE */
+#endif /* _MB_CAPABLE */
   
   return (c < 0x00ff ? (wint_t)(toupper ((int)c)) : c);
 }