X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmbsspn.c;h=3ef41ca1b3ede2cd8b8c11cb1caaaca6175b32b9;hb=84405cbc35207f178b1b50617254cb85ea803128;hp=921c953897f583532a6803bfe9ac61cb0da1f748;hpb=1006ae023bf3da7c67d8ce4f0d357fac2128bcce;p=gnulib.git

diff --git a/lib/mbsspn.c b/lib/mbsspn.c
index 921c95389..3ef41ca1b 100644
--- a/lib/mbsspn.c
+++ b/lib/mbsspn.c
@@ -1,11 +1,11 @@
 /* Searching a string for a character outside a given set of characters.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-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
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,17 +13,14 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* 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
    not in the character string REJECT.  Return the number of bytes from the
@@ -39,7 +36,6 @@ mbsspn (const char *string, const char *reject)
     {
       unsigned char uc = (unsigned char) reject[0];
 
-#if HAVE_MBRTOWC
       if (MB_CUR_MAX > 1)
 	{
 	  mbui_iterator_t iter;
@@ -51,7 +47,6 @@ mbsspn (const char *string, const char *reject)
 	  return mbui_cur_ptr (iter) - string;
 	}
       else
-#endif
 	{
 	  const char *ptr;
 
@@ -62,7 +57,6 @@ mbsspn (const char *string, const char *reject)
 	}
     }
   /* General case.  */
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       mbui_iterator_t iter;
@@ -91,6 +85,5 @@ mbsspn (const char *string, const char *reject)
       return mbui_cur_ptr (iter) - string;
     }
   else
-#endif
     return strspn (string, reject);
 }