From 888834f40d1bff6a4409aed98bba125348667f84 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 16 Oct 2016 17:45:52 +0200 Subject: Fix conflict between strerror_r-posix module and AC_FUNC_STRERROR_R. * m4/strerror_r.m4 (gl_FUNC_STRERROR_R): Override the values set by the AC_FUNC_STRERROR_R macro. Define HAVE_DECL_STRERROR_R_ORIG. * lib/strerror_r.c: Use HAVE_DECL_STRERROR_R_ORIG instead of HAVE_DECL_STRERROR_R. --- lib/strerror_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/strerror_r.c') diff --git a/lib/strerror_r.c b/lib/strerror_r.c index 07a00cf663..b1d4cf5909 100644 --- a/lib/strerror_r.c +++ b/lib/strerror_r.c @@ -40,7 +40,7 @@ extern #endif int __xpg_strerror_r (int errnum, char *buf, size_t buflen); -#elif HAVE_DECL_STRERROR_R && !(__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__) +#elif HAVE_DECL_STRERROR_R_ORIG && !(__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__) /* The system's strerror_r function is OK, except that its third argument is 'int', not 'size_t', or its return type is wrong. */ -- cgit v1.2.1