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

diff --git a/lib/mbslen.c b/lib/mbslen.c
index cb5ac5b46..2dd6ea8bb 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-2008 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;
@@ -43,6 +40,5 @@ mbslen (const char *string)
       return count;
     }
   else
-#endif
     return strlen (string);
 }