2 files changed, 2 insertions, 4 deletions
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index 7ee5f4bc1e..f37d69f365 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -785,7 +785,7 @@ char *rep_get_current_dir_name(void)
 }
 #endif
 
-#if !defined(HAVE_STRERROR_R) || !defined(STRERROR_R_PROTO_COMPATIBLE)
+#if !defined(HAVE_STRERROR_R) && !defined(strerror_r)
 int rep_strerror_r(int errnum, char *buf, size_t buflen)
 {
 	char *s = strerror(errnum);
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index cb412c273d..4cdc362b6a 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -570,9 +570,7 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset)
 char *rep_get_current_dir_name(void);
 #endif
 
-#if !defined(HAVE_STRERROR_R) || !defined(STRERROR_R_PROTO_COMPATIBLE)
-#undef strerror_r
-#define strerror_r rep_strerror_r
+#if !defined(HAVE_STRERROR_R) && !defined(strerror_r)
 int rep_strerror_r(int errnum, char *buf, size_t buflen);
 #endif