* system.h [rindex, incl, bcopy, bzero]: Ditto.

* userspec.c [index]: Ditto.

diff --git a/lib/userspec.c b/lib/userspec.c
index 60c6ecc..44d7d91 100644 (file)
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -22,9 +22,11 @@
 #include <pwd.h>
 #include <grp.h>
 
-#if defined(USG) || defined(STDC_HEADERS)
+#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
+#ifndef index
 #define index strchr
+#endif
 #else
 #include <strings.h>
 #endif