# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 974449141 0
# Node ID 917f240a07a348401ce996f302c60f2601ba2126
# Parent  c9edf250f3e7a0c0691bda5d258bd91cd16ff649
Update from GNU libc.

diff --git a/lib/strstr.c b/lib/strstr.c
--- a/lib/strstr.c
+++ b/lib/strstr.c
@@ -28,11 +28,15 @@
 # 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 @@
 	      }
 	    while (*rhaystack == a);
 
-	  needle = rneedle;		   /* took the register-poor aproach */
+	  needle = rneedle;		   /* took the register-poor approach */
 
 	  if (a == '\0')
 	    break;