Tests for module 'unicase/u16-is-uppercase'.

[gnulib.git] / lib / mbspbrk.c

diff --git a/lib/mbspbrk.c b/lib/mbspbrk.c
index cc73186..bf56d5a 100644 (file)
--- a/lib/mbspbrk.c
+++ b/lib/mbspbrk.c
@@ -1,11 +1,11 @@
 /* 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-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
    in the character string ACCEPT.  Return the pointer to it, or NULL if none
@@ -37,7 +34,6 @@ mbspbrk (const char *string, const char *accept)
   if (accept[1] == '\0')
     return mbschr (string, accept[0]);
   /* General case.  */
-#if HAVE_MBRTOWC
   if (MB_CUR_MAX > 1)
     {
       mbui_iterator_t iter;
@@ -46,7 +42,7 @@ mbspbrk (const char *string, const char *accept)
        {
          if (mb_len (mbui_cur (iter)) == 1)
            {
-             if (mbschr (accept, (unsigned char) * mbui_cur_ptr (iter)))
+             if (mbschr (accept, * mbui_cur_ptr (iter)))
                return (char *) mbui_cur_ptr (iter);
            }
          else
@@ -63,6 +59,5 @@ mbspbrk (const char *string, const char *accept)
       return NULL;
     }
   else
-#endif
     return strpbrk (string, accept);
 }