X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fstrstr.c;h=c41e90349ff7b96be0cbcfdf2194649f551048b3;hb=9d5abcc106db6e9c3e4dc71ad859265c54bb4d60;hp=f8137c577e1d62024acf514d9d15d1b6099e3a21;hpb=d349992d82f97d614404565ff66e3f8a47b4a568;p=gnulib.git

diff --git a/lib/strstr.c b/lib/strstr.c
index f8137c577..c41e90349 100644
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1999 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 This program is free software; you can redistribute it and/or modify
@@ -28,11 +28,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 # include <config.h>
 #endif
 
-#include <string.h>
+#if defined _LIBC || defined HAVE_STRING_H
+# include <string.h>
+#endif
 #include <sys/types.h>
 
 typedef unsigned chartype;
 
+#undef strstr
+
 char *
 strstr (const char *phaystack, const char *pneedle)
 {
@@ -105,7 +109,7 @@ jin:	  a = *++haystack;
 	      }
 	    while (*rhaystack == a);
 
-	  needle = rneedle;		   /* took the register-poor aproach */
+	  needle = rneedle;		   /* took the register-poor approach */
 
 	  if (a == '\0')
 	    break;