X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbschr.c;h=c43ac66b444873773b765a0b102acb7f60cdbe69;hb=76074e9af140661560dc1ce16d0a80c2e768a740;hp=5997b18cfdb0a1ae05bccea783e32269f9fd8c7a;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/mbschr.c b/lib/mbschr.c
index 5997b18cf..c43ac66b4 100644
--- a/lib/mbschr.c
+++ b/lib/mbschr.c
@@ -1,5 +1,5 @@
 /* Searching a string for a character.
-   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
@@ -20,37 +20,33 @@
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 /* Locate the first single-byte character C in the character string STRING,
    and return a pointer to it.  Return NULL if C is not found in STRING.  */
 char *
 mbschr (const char *string, int c)
 {
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1
       /* Optimization: We know that ASCII characters < 0x30 don't occur as
-	 part of multibyte characters longer than 1 byte.  Hence, if c < 0x30,
-	 the faster unibyte loop can be used.  */
+         part of multibyte characters longer than 1 byte.  Hence, if c < 0x30,
+         the faster unibyte loop can be used.  */
       && (unsigned char) c >= 0x30)
     {
       mbui_iterator_t iter;
 
       for (mbui_init (iter, string);; mbui_advance (iter))
-	{
-	  if (!mbui_avail (iter))
-	    goto notfound;
-	  if (mb_len (mbui_cur (iter)) == 1
-	      && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c)
-	    break;
-	}
+        {
+          if (!mbui_avail (iter))
+            goto notfound;
+          if (mb_len (mbui_cur (iter)) == 1
+              && (unsigned char) * mbui_cur_ptr (iter) == (unsigned char) c)
+            break;
+        }
       return (char *) mbui_cur_ptr (iter);
      notfound:
       return NULL;
     }
   else
-#endif
     return strchr (string, c);
 }