X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbsnlen.c;h=eb6ebbcb0be8d48a95fc3cbe8c2a10671259ce86;hb=25b6b5120113989e0b91de9d0b75d3d625bbc753;hp=4cd33584ba208057a31b4f0c75861e0d98c7c87d;hpb=60ed215df062bdeef13b2cef7a9aa1956a070248;p=gnulib.git

diff --git a/lib/mbsnlen.c b/lib/mbsnlen.c
index 4cd33584b..eb6ebbcb0 100644
--- a/lib/mbsnlen.c
+++ b/lib/mbsnlen.c
@@ -1,11 +1,11 @@
 /* Counting the multibyte characters in a string.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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,8 +13,7 @@
    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>
 
@@ -23,16 +22,13 @@
 
 #include <stdlib.h>
 
-#if HAVE_MBRTOWC
-# include "mbiter.h"
-#endif
+#include "mbiter.h"
 
 /* Return the number of multibyte characters in the character string starting
    at STRING and ending at STRING + LEN.  */
 size_t
 mbsnlen (const char *string, size_t len)
 {
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       size_t count;
@@ -40,11 +36,10 @@ mbsnlen (const char *string, size_t len)
 
       count = 0;
       for (mbi_init (iter, string, len); mbi_avail (iter); mbi_advance (iter))
-	count++;
+        count++;
 
       return count;
     }
   else
-#endif
     return len;
 }