> 2017-04-23 Bruno Haible <br...@clisp.org>
>
> Fix conflict between strerror_r-posix module and AC_FUNC_STRERROR_R.
> * modules/strerror_r-posix (configure.ac): Invoke gl_MODULE_INDICATOR.
> * lib/error.c: Test GNULIB_STRERROR_R_POSIX before testing
> HAVE_DECL_STRERROR_R, HAVE_STRERROR_R, or STRERROR_R_CHAR_P.
> * lib/argp-help.c (__argp_failure): Likewise.
Oops, there was a mistake in this patch. Fixing it as follows:
2017-04-29 Bruno Haible <br...@clisp.org>
error: Fix mistake in 2017-04-23 commit.
* lib/error.c (print_errno_message): If GNULIB_STRERROR_R_POSIX is set,
assume that strerror_r returns 'int', not 'char *'.
--- a/lib/error.c
+++ b/lib/error.c
@@ -174,7 +174,7 @@ print_errno_message (int errnum)
#if _LIBC || GNULIB_STRERROR_R_POSIX || defined HAVE_STRERROR_R
char errbuf[1024];
-# if _LIBC || GNULIB_STRERROR_R_POSIX || STRERROR_R_CHAR_P
+# if _LIBC || (!GNULIB_STRERROR_R_POSIX && STRERROR_R_CHAR_P)
s = __strerror_r (errnum, errbuf, sizeof errbuf);
# else
if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
