X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrcspn.c;h=3cee66424c5a8ef21d7d08b5c2c4772e8708ceeb;hb=e48f10e4203e9770b4c5b9ca75de51b05e7ea0b6;hp=2a8f293ca19556989059d0ac7b50d18b9b2b23b4;hpb=a474e30be08989343a9a132ab6a1ca5bdeaaec9b;p=gnulib.git

diff --git a/lib/strcspn.c b/lib/strcspn.c
index 2a8f293ca..3cee66424 100644
--- a/lib/strcspn.c
+++ b/lib/strcspn.c
@@ -1,36 +1,43 @@
 /* Copyright (C) 1991 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.
+   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 2, 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
+   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, Inc., 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, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <ansidecl.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
-
+#else
+#include <strings.h>
+#ifndef strchr
+#define strchr index
+#endif
+#endif
 
 /* Return the length of the maximum inital segment of S
    which contains no characters from REJECT.  */
-size_t
-DEFUN(strcspn, (s, reject),
-      register CONST char *s AND register CONST char *reject)
+int
+strcspn (s, reject)
+     register char *s;
+     register char *reject;
 {
-  register size_t count = 0;
+  register int count = 0;
 
   while (*s != '\0')
-    if (strchr(reject, *s++) == NULL)
+    if (strchr (reject, *s++) == 0)
       ++count;
     else
       return count;