merge with 3.5

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 7a624cfece6d890f6a464d5a6ec3807c346f793b..f15e530bff759a2ca4b2fec698800467dd369b0e 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -24,8 +24,12 @@
 #include "backupfile.h"
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
+#ifndef index
 #define index strchr
+#endif
+#ifndef rindex
 #define rindex strrchr
+#endif
 #else
 #include <strings.h>
 #endif