X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=3ca5c97654ac29e5073bf359afbff2abef36c223;hb=c1e84a1314394b86dd121372a6656bb6c6df349b;hp=98b78a1e658e69d7aa5b91107b69af45838ffe7a;hpb=26e411da187cbe2e67d334a9230f4836219c24e2;p=gnulib.git

diff --git a/lib/makepath.c b/lib/makepath.c
index 98b78a1e6..3ca5c9765 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -49,9 +49,11 @@ char *alloca ();
 extern int errno;
 #endif
 
-#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