Ah, I missed a use of that attribute within Gnulib when installing the recent
changes for __has_attribute. I installed the attached patch to fix it, and the
followup two patches (also attached) to fix some style nits I noticed while
fixing the bug. Thanks for reporting it.
>From 63dcb4d03efd09db847635daaa34d5a907f5be2c Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
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 <egg...@cs.ucla.edu>
+
+ 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 <egg...@cs.ucla.edu>
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 <stdarg.h>
# include <stdio.h>
-/* 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
>From 2f06af8d695c4ccc33840797d646f1ec94ce804c Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
Date: Wed, 6 May 2020 15:51:32 -0700
Subject: [PATCH 2/3] * lib/attribute.h: Minor style fixes.
---
ChangeLog | 2 ++
lib/attribute.h | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bd7219102..e2b1bfb56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2020-05-06 Paul Eggert <egg...@cs.ucla.edu>
+ * lib/attribute.h: Minor style fixes.
+
Fix version-etc glitch on OpenIndiana
Problem reported by Mats Erik Andersson in:
https://lists.gnu.org/r/bug-gnulib/2020-05/msg00067.html
diff --git a/lib/attribute.h b/lib/attribute.h
index bb7c550f1..a4e12dfc6 100644
--- a/lib/attribute.h
+++ b/lib/attribute.h
@@ -33,26 +33,26 @@
/* Selected GCC attributes; see:
https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html
These names begin with 'ATTRIBUTE_' to avoid name clashes. */
-#define ATTRIBUTE_ALLOC_SIZE(args) _GL_ATTRIBUTE_ALLOC_SIZE(args)
+#define ATTRIBUTE_ALLOC_SIZE(args) _GL_ATTRIBUTE_ALLOC_SIZE (args)
#define ATTRIBUTE_ALWAYS_INLINE _GL_ATTRIBUTE_ALWAYS_INLINE
#define ATTRIBUTE_ARTIFICIAL _GL_ATTRIBUTE_ARTIFICIAL
#define ATTRIBUTE_COLD _GL_ATTRIBUTE_COLD
#define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST
#define ATTRIBUTE_DEPRECATED _GL_ATTRIBUTE_DEPRECATED
-#define ATTRIBUTE_ERROR(msg) _GL_ATTRIBUTE_ERROR(msg)
+#define ATTRIBUTE_ERROR(msg) _GL_ATTRIBUTE_ERROR (msg)
#define ATTRIBUTE_EXTERNALLY_VISIBLE _GL_ATTRIBUTE_EXTERNALLY_VISIBLE
-#define ATTRIBUTE_FORMAT(spec) _GL_ATTRIBUTE_FORMAT(spec)
+#define ATTRIBUTE_FORMAT(spec) _GL_ATTRIBUTE_FORMAT (spec)
#define ATTRIBUTE_LEAF _GL_ATTRIBUTE_LEAF
#define ATTRIBUTE_MAY_ALIAS _GL_ATTRIBUTE_MAY_ALIAS
#define ATTRIBUTE_MALLOC _GL_ATTRIBUTE_MALLOC
#define ATTRIBUTE_NOINLINE _GL_ATTRIBUTE_NOINLINE
-#define ATTRIBUTE_NONNULL(args) _GL_ATTRIBUTE_NONNULL(args)
+#define ATTRIBUTE_NONNULL(args) _GL_ATTRIBUTE_NONNULL (args)
#define ATTRIBUTE_NONSTRING _GL_ATTRIBUTE_NONSTRING
#define ATTRIBUTE_NOTHROW _GL_ATTRIBUTE_NOTHROW
#define ATTRIBUTE_PACKED _GL_ATTRIBUTE_PACKED
#define ATTRIBUTE_PURE _GL_ATTRIBUTE_PURE
#define ATTRIBUTE_RETURNS_NONNULL _GL_ATTRIBUTE_RETURNS_NONNULL
-#define ATTRIBUTE_SENTINEL(pos) _GL_ATTRIBUTE_SENTINEL(pos)
-#define ATTRIBUTE_WARNING(msg) _GL_ATTRIBUTE_WARNING(msg)
+#define ATTRIBUTE_SENTINEL(pos) _GL_ATTRIBUTE_SENTINEL (pos)
+#define ATTRIBUTE_WARNING(msg) _GL_ATTRIBUTE_WARNING (msg)
#endif /* _GL_ATTRIBUTE_H */
--
2.17.1
>From 2e3f0c910896a52ce0944bd04d4da3413682cf1f Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
Date: Wed, 6 May 2020 15:51:49 -0700
Subject: [PATCH 3/3] * m4/gnulib-common.m4 (gl_COMMON_BODY): Minor style
fixes.
---
ChangeLog | 2 ++
m4/gnulib-common.m4 | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e2b1bfb56..0e0cc81ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2020-05-06 Paul Eggert <egg...@cs.ucla.edu>
+ * m4/gnulib-common.m4 (gl_COMMON_BODY): Minor style fixes.
+
* lib/attribute.h: Minor style fixes.
Fix version-etc glitch on OpenIndiana
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index b0010d0e3..79771599b 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -122,7 +122,7 @@ AC_DEFUN([gl_COMMON_BODY], [
/* Avoid __attribute__ ((cold)) on MinGW; see thread starting at
<https://lists.gnu.org/r/emacs-devel/2019-04/msg01152.html>. */
#if _GL_HAS_ATTRIBUTE (cold) && !defined __MINGW32__
-# define _GL_ATTRIBUTE_COLD __attribute__ ((cold))
+# define _GL_ATTRIBUTE_COLD __attribute__ ((__cold__))
#else
# define _GL_ATTRIBUTE_COLD
#endif
@@ -142,8 +142,8 @@ AC_DEFUN([gl_COMMON_BODY], [
#endif
#if _GL_HAS_ATTRIBUTE (error)
-# define _GL_ATTRIBUTE_ERROR(msg) __attribute__((__error__ (msg)))
-# define _GL_ATTRIBUTE_WARNING(msg) __attribute__((__warning__ (msg)))
+# define _GL_ATTRIBUTE_ERROR(msg) __attribute__ ((__error__ (msg)))
+# define _GL_ATTRIBUTE_WARNING(msg) __attribute__ ((__warning__ (msg)))
#else
# define _GL_ATTRIBUTE_ERROR(msg)
# define _GL_ATTRIBUTE_WARNING(msg)
--
2.17.1
