From: Jim Meyering <jim@meyering.net>
Date: Fri, 17 Nov 2000 08:19:01 +0000 (+0000)
Subject: Update from GNU libc.
X-Git-Tag: FILEUTILS-4_0_33~105
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=00fba41266828b351d4185a6a6bcd289096567cf;p=thirdparty%2Fcoreutils.git

Update from GNU libc.
---

diff --git a/lib/strstr.c b/lib/strstr.c
index 7709d8464a..c41e90349f 100644
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -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;