From: Bruno Haible <bruno@clisp.org>
Date: Thu, 15 Apr 2021 00:11:51 +0000 (+0200)
Subject: c-stack: Don't use an undefined C macro (regression from 2020-10-04).
X-Git-Tag: v1.0~2951
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cccc5cc0087cb0557b4010bb94b7fe829f546e0;p=thirdparty%2Fgnulib.git

c-stack: Don't use an undefined C macro (regression from 2020-10-04).

* lib/c-stack.c: Test GNU C version directly, without __GNUC_PREREQ.
---

diff --git a/ChangeLog b/ChangeLog
index 69b8c25bae..969a9ffb72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-14  Bruno Haible  <bruno@clisp.org>
+
+	c-stack: Don't use an undefined C macro (regression from 2020-10-04).
+	* lib/c-stack.c: Test GNU C version directly, without __GNUC_PREREQ.
+
 2021-04-12  Bruno Haible  <bruno@clisp.org>
 
 	doc: Fix confusion between LIBADD and LDADD.
diff --git a/lib/c-stack.c b/lib/c-stack.c
index 50caafac28..c0da7f4048 100644
--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -171,7 +171,7 @@ null_action (int signo _GL_UNUSED)
 #if USE_LIBSIGSEGV
 
 /* Pacify GCC 9.3.1, which otherwise would complain about segv_handler.  */
-# if __GNUC_PREREQ (4, 6)
+# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
 #  pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
 # endif