X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrpbrk.c;h=01d8df5a8aeda5b19b0f955a650590e05816772c;hb=f80143b5b5eecb2600d1d680fca3c2ecc90cbcbe;hp=6ed62a63c7cc9876c9fa31ec28950357850216db;hpb=34c0f07b980b0b13d2d18e1dc5c28989eb507b22;p=gnulib.git

diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 6ed62a63c..01d8df5a8 100644
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 2000 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.
 
@@ -16,11 +16,19 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#if HAVE_CONFIG_H
+#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 (const char *s, const char *accept)
 {
@@ -33,5 +41,5 @@ strpbrk (const char *s, const char *accept)
       ++s;
     }
 
-  return 0;
+  return NULL;
 }