From 7b1995946d713bef274a7113f740774a4427f62d Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 22 Apr 1993 03:17:11 +0000
Subject: [PATCH] merge with 3.5

---
 lib/backupfile.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 7a624cfece..f15e530bff 100644
--- 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
-- 
2.30.2