From 6160ee8e4d2b88d934c3c4c8c5930a75b835723f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 28 Sep 2020 01:18:49 -0700 Subject: [PATCH] version-etc: pacify Oracle Studio 12.6 Without this patch, it complains: "version-etc.h", line 64: warning: token-less macro argument (E_TOKENLESS_MACRO)" when in pedantic mode. * lib/version-etc.h (version_etc): Port to C89 macro rules. --- ChangeLog | 8 ++++++++ lib/attribute.h | 2 +- lib/version-etc.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f57bdaf160..a826969a8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-09-28 Paul Eggert + + version-etc: pacify Oracle Studio 12.6 + Without this patch, it complains: "version-etc.h", line 64: + warning: token-less macro argument (E_TOKENLESS_MACRO)" when in + pedantic mode. + * lib/version-etc.h (version_etc): Port to C89 macro rules. + 2020-09-27 Bruno Haible Avoid "warning: The macro `AC_DECL_SYS_SIGLIST' is obsolete". diff --git a/lib/attribute.h b/lib/attribute.h index d8d6286c05..b97514655f 100644 --- a/lib/attribute.h +++ b/lib/attribute.h @@ -80,7 +80,7 @@ /* Attributes for variadic functions. */ /* The variadic function expects a trailing NULL argument. - ATTRIBUTE_SENTINEL () - The last argument is NULL. + ATTRIBUTE_SENTINEL () - The last argument is NULL (requires C99). ATTRIBUTE_SENTINEL ((N)) - The (N+1)st argument from the end is NULL. */ /* Applies to: functions. */ #define ATTRIBUTE_SENTINEL(pos) _GL_ATTRIBUTE_SENTINEL (pos) diff --git a/lib/version-etc.h b/lib/version-etc.h index 813084c3de..dd1edafd87 100644 --- a/lib/version-etc.h +++ b/lib/version-etc.h @@ -61,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 ((0)); /* Display the usual "Report bugs to" stanza. */ extern void emit_bug_reporting_address (void); -- 2.39.5