Mercurial > gnulib

changeset 38533:ef26b058a931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 *'.
author Bruno Haible <bruno@clisp.org>
date Fri, 05 May 2017 00:09:48 +0200
parents 65a32cc6cc23
children ab78ae13dd6d
files ChangeLog lib/argp-help.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu May 04 17:51:43 2017 +0200
+++ b/ChangeLog	Fri May 05 00:09:48 2017 +0200
@@ -1,3 +1,9 @@
+2017-05-04 Bruno Haible  <bruno@clisp.org>
+
+	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  <rrt@sc3d.org>
 
 	argp: Fix typo.
--- a/lib/argp-help.c	Thu May 04 17:51:43 2017 +0200
+++ b/lib/argp-help.c	Fri May 05 00:09:48 2017 +0200
@@ -1874,7 +1874,7 @@
               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)