From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 4 Jul 2012 00:36:28 +0000 (-0700)
Subject: * regex.c: Suppress GCC warning on RHEL 6.  (Bug#11207)
X-Git-Tag: emacs-24.2.90~1199^2~236
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=63807d4757d1c2ab6e4e0c5ec537316fcb324436;p=emacs.git

* regex.c: Suppress GCC warning on RHEL 6.  (Bug#11207)

Conditionalize the pragmas on GCC 4.5 or later, not GCC 4.3 or later,
since GCC 4.4.6 issues a bogus warning for them.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5433c2ff831..f01b49e3da0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2012-07-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* regex.c: Suppress GCC warning on RHEL 6.  (Bug#11207)
+	Conditionalize the pragmas on GCC 4.5 or later, not GCC 4.3 or later,
+	since GCC 4.4.6 issues a bogus warning for them.
+
 	Fix bugs in file timestamp newness comparisons.
 	* fileio.c (Ffile_newer_than_file_p):
 	* lread.c (Fload): Use full timestamp resolution of files,
diff --git a/src/regex.c b/src/regex.c
index 0b09e508b37..f3f70060b2e 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -35,7 +35,7 @@
 
 /* Ignore some GCC warnings for now.  This section should go away
    once the Emacs and Gnulib regex code is merged.  */
-#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
+#if (__GNUC__ == 4 && 5 <= __GNUC_MINOR__) || 4 < __GNUC__
 # pragma GCC diagnostic ignored "-Wstrict-overflow"
 # ifndef emacs
 #  pragma GCC diagnostic ignored "-Wunused-but-set-variable"