>From 63dcb4d03efd09db847635daaa34d5a907f5be2c Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 6 May 2020 15:51:10 -0700 Subject: [PATCH 1/3] Fix version-etc glitch on OpenIndiana Problem reported by Mats Erik Andersson in: https://lists.gnu.org/r/bug-gnulib/2020-05/msg00067.html * lib/version-etc.h (_GL_ATTRIBUTE_SENTINEL): Remove defn that now clashes with gnulib-common.h. All uses changed. --- ChangeLog | 8 ++++++++ lib/version-etc.h | 11 +---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 693671e46..bd7219102 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-05-06 Paul Eggert + + Fix version-etc glitch on OpenIndiana + Problem reported by Mats Erik Andersson in: + https://lists.gnu.org/r/bug-gnulib/2020-05/msg00067.html + * lib/version-etc.h (_GL_ATTRIBUTE_SENTINEL): Remove defn + that now clashes with gnulib-common.h. All uses changed. + 2020-05-03 Paul Eggert attribute: new module diff --git a/lib/version-etc.h b/lib/version-etc.h index 73cad566d..813084c3d 100644 --- a/lib/version-etc.h +++ b/lib/version-etc.h @@ -22,15 +22,6 @@ # include # include -/* The 'sentinel' attribute was added in gcc 4.0. */ -#ifndef _GL_ATTRIBUTE_SENTINEL -# if 4 <= __GNUC__ -# define _GL_ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__)) -# else -# define _GL_ATTRIBUTE_SENTINEL /* empty */ -# endif -#endif - extern const char version_etc_copyright[]; /* The three functions below display the --version information in the @@ -70,7 +61,7 @@ extern void version_etc (FILE *stream, const char *command_name, const char *package, const char *version, /* const char *author1, ..., NULL */ ...) - _GL_ATTRIBUTE_SENTINEL; + _GL_ATTRIBUTE_SENTINEL (); /* Display the usual "Report bugs to" stanza. */ extern void emit_bug_reporting_address (void); -- 2.17.1