X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fputenv.c;h=d1fb726f3f1e6b5d1dca01d7594b52c1cd843cfd;hb=6b89992dbb9ec71f4505b47447bde264e3035056;hp=512878c478e869cd2e716246358b2f9a69e808b7;hpb=43e78b970f396160a887c9da94531569faeda8a0;p=gnulib.git

diff --git a/lib/putenv.c b/lib/putenv.c
index 512878c47..d1fb726f3 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -26,8 +26,12 @@ extern int errno;
 
 #if defined(STDC_HEADERS) || defined(USG)
 #include <string.h>
+#ifndef index
 #define index strchr
+#endif
+#ifndef bcopy
 #define bcopy(s, d, n) memcpy((d), (s), (n))
+#endif
 #else /* not (STDC_HEADERS or USG) */
 #include <strings.h>
 #endif /* STDC_HEADERS or USG */