From f9973ab5540a56ee89888799a6d7a12c9aa603cf Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 29 Apr 2017 23:01:39 +0200 Subject: [PATCH] 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 *'. --- ChangeLog | 6 ++++++ lib/error.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6882eece9e..4e052a710b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-04-29 Bruno Haible + + 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 *'. + 2017-04-29 Bruno Haible stat: Fix time_t values and other problems on native Windows platforms. diff --git a/lib/error.c b/lib/error.c index feda7208d3..ed9b37a955 100644 --- 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) -- 2.39.5