X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrpbrk.c;h=72de53a8944d8581a399f73f29f6d23684b178d1;hb=32839c247d8c816279e1b5d1a3ed68c5652cf72e;hp=01d8df5a8aeda5b19b0f955a650590e05816772c;hpb=b51fcc0b038ac4d720d7d34ad98d78a14824e444;p=gnulib.git

diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 01d8df5a8..72de53a89 100644
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 1991, 1994, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2010 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.
 
@@ -14,17 +16,12 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stddef.h>
-
-#if defined _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
 #undef strpbrk
 
@@ -36,8 +33,8 @@ strpbrk (const char *s, const char *accept)
     {
       const char *a = accept;
       while (*a != '\0')
-	if (*a++ == *s)
-	  return (char *) s;
+        if (*a++ == *s)
+          return (char *) s;
       ++s;
     }