X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrpbrk.c;h=01d8df5a8aeda5b19b0f955a650590e05816772c;hb=4bc0a0ad4c963017ab77335801566546afbf965b;hp=3e602016570403694f211d6b1966a0650133b7f4;hpb=b6922b3b06da71d7ba8d7c6b458339c4dc697b0a;p=gnulib.git

diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 3e6020165..01d8df5a8 100644
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 2000, 2002 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.
 
@@ -13,18 +13,24 @@
    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.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-/* Find the first ocurrence in S of any character in ACCEPT.  */
+#include <stddef.h>
+
+#if defined _LIBC || HAVE_STRING_H
+# include <string.h>
+#endif
+
+#undef strpbrk
+
+/* Find the first occurrence in S of any character in ACCEPT.  */
 char *
-strpbrk (s, accept)
-     register const char *s;
-     register const char *accept;
+strpbrk (const char *s, const char *accept)
 {
   while (*s != '\0')
     {
@@ -35,5 +41,5 @@ strpbrk (s, accept)
       ++s;
     }
 
-  return 0;
+  return NULL;
 }