From: Jim Meyering <meyering@redhat.com>
Date: Wed, 4 Apr 2012 11:32:15 +0000 (+0200)
Subject: regex: correct #pragma guard expression
X-Git-Tag: v0.1~755
X-Git-Url: https://erislabs.net/gitweb/?a=commitdiff_plain;h=d4cecf1ee37f6b611ef092c9c7fa3761d02ce2c3;p=gnulib.git

regex: correct #pragma guard expression

* lib/regex.c: -Wsuggest-attribute=pure was introduced in gcc-4.6,
not 4.3.  Correct its cpp guard expression.
---

diff --git a/ChangeLog b/ChangeLog
index 2f8eb0f75..d41141cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-04  Jim Meyering  <meyering@redhat.com>
+
+	regex: correct #pragma guard expression
+	* lib/regex.c: -Wsuggest-attribute=pure was introduced in gcc-4.6,
+	not 4.3.  Correct its cpp guard expression.
+
 2012-04-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	regex: remove unnecessary type punning
diff --git a/lib/regex.c b/lib/regex.c
index a8e2341ca..ab27536c8 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -19,8 +19,10 @@
 #ifndef _LIBC
 # include <config.h>
 
-# if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+# if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
 #  pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
+# endif
+# if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
 #  pragma GCC diagnostic ignored "-Wtype-limits"
 # endif
 #endif