NEWS.stable: log cherry-pick [e446f25]->[c092018] relocatable-shell: Update suggested...

[gnulib.git] / lib / mbslen.c

diff --git a/lib/mbslen.c b/lib/mbslen.c
index 41c219f..74c6ec1 100644 (file)
--- a/lib/mbslen.c
+++ b/lib/mbslen.c
@@ -1,11 +1,11 @@
 /* Counting the multibyte characters in a string.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,23 +13,21 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include <stdlib.h>
+
+#include "mbuiter.h"
 
 /* Return the number of multibyte characters in the character string STRING.  */
 size_t
 mbslen (const char *string)
 {
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       size_t count;
@@ -37,11 +35,10 @@ mbslen (const char *string)
 
       count = 0;
       for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
-       count++;
+        count++;
 
       return count;
     }
   else
-#endif
     return strlen (string);
 }