X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbscspn.c;h=68ac1c79769a24591cf29e5f0e5fa9779765a0d7;hb=3e460831579f03b5f96703073b02052478b854df;hp=e0818e19d4d24239c235d5e961d709d8a87cd7e1;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/mbscspn.c b/lib/mbscspn.c
index e0818e19d..68ac1c797 100644
--- a/lib/mbscspn.c
+++ b/lib/mbscspn.c
@@ -1,5 +1,5 @@
 /* Searching a string for a character among a given set of characters.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-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
@@ -20,9 +20,7 @@
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 /* Find the first occurrence in the character string STRING of any character
    in the character string ACCEPT.  Return the number of bytes from the
@@ -40,33 +38,31 @@ mbscspn (const char *string, const char *accept)
       return (ptr != NULL ? ptr - string : strlen (string));
     }
   /* General case.  */
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       mbui_iterator_t iter;
 
       for (mbui_init (iter, string); mbui_avail (iter); mbui_advance (iter))
-	{
-	  if (mb_len (mbui_cur (iter)) == 1)
-	    {
-	      if (mbschr (accept, * mbui_cur_ptr (iter)))
-		goto found;
-	    }
-	  else
-	    {
-	      mbui_iterator_t aiter;
+        {
+          if (mb_len (mbui_cur (iter)) == 1)
+            {
+              if (mbschr (accept, * mbui_cur_ptr (iter)))
+                goto found;
+            }
+          else
+            {
+              mbui_iterator_t aiter;
 
-	      for (mbui_init (aiter, accept);
-		   mbui_avail (aiter);
-		   mbui_advance (aiter))
-		if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
-		  goto found;
-	    }
-	}
+              for (mbui_init (aiter, accept);
+                   mbui_avail (aiter);
+                   mbui_advance (aiter))
+                if (mb_equal (mbui_cur (aiter), mbui_cur (iter)))
+                  goto found;
+            }
+        }
      found:
       return mbui_cur_ptr (iter) - string;
     }
   else
-#endif
     return strcspn (string, accept);
 }