lib/replace: Do not use STRERROR_R_PROTO_COMPATIBLE as only roken.h sets this

Currently, we put strerror_r into libreplace even on systems with strerror_r.

Andrew Bartlett

Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index 7ee5f4bc1e750b36f4670e67b59bd8be389b6a98..f37d69f36543e86d56baac7dd03cec6ef49944e2 100644 (file)
--- 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 cb412c273d188759b4b750e06d6f28572507882e..4cdc362b6a26255a53aa1bb78b13d9a3eec7d2c6 100644 (file)
--- 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