* 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 5433c2ff83138a13a58f7ba7f5b09a8ccf8c0f4e..f01b49e3da088f39ac3aad37a6bc9000e9e19e71 100644 (file)
--- 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 0b09e508b37c727445a7bf55c66fd9b356171b18..f3f70060b2e40f1a47e7d888e3509f623fd02015 100644 (file)
--- 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"