regex: also remove dependency on HAVE_WCSCOLL

[gnulib.git] / lib / strcspn.c

diff --git a/lib/strcspn.c b/lib/strcspn.c
index 2a8f293..41e28f1 100644 (file)
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,36 +1,38 @@
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 1996-1997, 2002-2003, 2005-2006, 2009-2013 Free
+ * Software Foundation, Inc.
 
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@gnu.org.
 
-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.
+   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 3 of the License, or 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
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <ansidecl.h>
+#include <config.h>
+
+#include <stddef.h>
 #include <string.h>
 
+#undef strcspn
 
-/* Return the length of the maximum inital segment of S
+/* Return the length of the maximum initial segment of S
    which contains no characters from REJECT.  */
 size_t
-DEFUN(strcspn, (s, reject),
-      register CONST char *s AND register CONST char *reject)
+strcspn (const char *s, const char *reject)
 {
-  register size_t count = 0;
+  size_t count = 0;
 
   while (*s != '\0')
-    if (strchr(reject, *s++) == NULL)
+    if (strchr (reject, *s++) == NULL)
       ++count;
     else
       return count;