X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbslen.c;h=efddd52454e8e49c3cf4ac837d76bb8c902603d6;hb=fb6aa6ad7dd950729f4e3349d89d4ad82761af61;hp=cb5ac5b46d9e4facb69f6b28e7455a8402c4ca87;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/mbslen.c b/lib/mbslen.c
index cb5ac5b46..efddd5245 100644
--- a/lib/mbslen.c
+++ b/lib/mbslen.c
@@ -1,5 +1,5 @@
 /* Counting the multibyte characters in a string.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,15 +22,12 @@
 
 #include <stdlib.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#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;
@@ -38,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);
 }