diff options
| author | Bruno Haible <bruno@clisp.org> | 2017-04-23 19:02:08 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2017-04-25 00:02:07 +0200 |
| commit | 1b19f8fb032be81398434b709192d06d17abbb87 (patch) | |
| tree | a819f10da9293b42422f38a28056571fb90d3415 /lib/argp-help.c | |
| parent | 60530d050b8d50ab442026e6b6fac30245e459fd (diff) | |
| download | gnulib-1b19f8fb032be81398434b709192d06d17abbb87.tar.gz | |
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.
Diffstat (limited to 'lib/argp-help.c')
| -rw-r--r-- | lib/argp-help.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/argp-help.c b/lib/argp-help.c index 5567eeea44..ae639bd066 100644 --- a/lib/argp-help.c +++ b/lib/argp-help.c @@ -1873,8 +1873,8 @@ __argp_failure (const struct argp_state *state, int status, int errnum, char const *s = NULL; putc_unlocked (':', stream); putc_unlocked (' ', stream); -# if HAVE_DECL_STRERROR_R -# if STRERROR_R_CHAR_P +# if GNULIB_STRERROR_R_POSIX || HAVE_DECL_STRERROR_R +# 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) |