X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbsrchr.c;h=087904dec142afe93c196226f13c853d3940df99;hb=31d3154399f8c679ba23afb0f6bef03b73d4c741;hp=679f9a48f47178a802c2616ce80e5cf036e92cd2;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/mbsrchr.c b/lib/mbsrchr.c
index 679f9a48f..087904dec 100644
--- a/lib/mbsrchr.c
+++ b/lib/mbsrchr.c
@@ -1,5 +1,5 @@
 /* Searching a string for the last occurrence of a character.
-   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
@@ -20,16 +20,13 @@
 /* Specification.  */
 #include <string.h>
 
-#if HAVE_MBRTOWC
-# include "mbuiter.h"
-#endif
+#include "mbuiter.h"
 
 /* Locate the last 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 *
 mbsrchr (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,
@@ -48,6 +45,5 @@ mbsrchr (const char *string, int c)
       return (char *) result;
     }
   else
-#endif
     return strrchr (string, c);
 }