From: Bruno Haible Date: Thu, 4 May 2017 22:09:48 +0000 (+0200) Subject: argp: Fix mistake in 2017-04-23 commit. X-Git-Tag: v1.0~6205 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=46da8e7d6bbb84ee41dc754cd10566d83336e9f2;p=gnulib.git argp: Fix mistake in 2017-04-23 commit. * lib/argp-help.c (__argp_failure): If GNULIB_STRERROR_R_POSIX is set, assume that strerror_r returns 'int', not 'char *'. --- diff --git a/ChangeLog b/ChangeLog index 90527b8bd4..4605c8e786 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-05-04 Bruno Haible + + argp: Fix mistake in 2017-04-23 commit. + * lib/argp-help.c (__argp_failure): If GNULIB_STRERROR_R_POSIX is set, + assume that strerror_r returns 'int', not 'char *'. + 2017-05-04 Reuben Thomas argp: Fix typo. diff --git a/lib/argp-help.c b/lib/argp-help.c index 05ab474575..06329606a7 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -1874,7 +1874,7 @@ __argp_failure (const struct argp_state *state, int status, int errnum, putc_unlocked (':', stream); putc_unlocked (' ', stream); # if GNULIB_STRERROR_R_POSIX || HAVE_DECL_STRERROR_R -# if GNULIB_STRERROR_R_POSIX || STRERROR_R_CHAR_P +# if !GNULIB_STRERROR_R_POSIX && STRERROR_R_CHAR_P s = __strerror_r (errnum, buf, sizeof buf); # else if (__strerror_r (errnum, buf, sizeof buf) == 0)