1 files changed, 13 insertions, 23 deletions
diff --git a/newlib/libc/stdlib/mblen_r.c b/newlib/libc/stdlib/mblen_r.c
index 9361f6573..22d1d40e6 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,34 +43,24 @@ effects vary with the locale.
 <<_mblen_r>> requires no supporting OS subroutines.
 */
 
-#include <newlib.h>
 #include <stdlib.h>
-#include <wchar.h>
 
 int
 _DEFUN (_mblen_r, (r, s, n, state), 
         struct _reent *r    _AND
         const char *s _AND
         size_t n _AND
-        mbstate_t *state)
+        int *state)
 {
-#ifdef _MB_CAPABLE
-  int retval;
-  retval = _mbtowc_r (r, NULL, s, n, state);
+#ifdef MB_CAPABLE
 
-  if (retval < 0)
-    {
-      state->__count = 0;
-      return -1;
-    }
-
-  return retval;
-#else /* not _MB_CAPABLE */
-  if (s == NULL || *s == '\0')
-    return 0;
-  if (n == 0)
-    return -1;
-  return 1;
-#endif /* not _MB_CAPABLE */
+        return _mbtowc_r (r, NULL, s, n, state);
+#else /* not MB_CAPABLE */
+        if (s == NULL || *s == '\0')
+                return 0;
+        if (n == 0)
+                return -1;
+        return 1;
+#endif /* not MB_CAPABLE */
 }