[Emacs-diffs] /srv/bzr/emacs/trunk r108851: * regex.c: Suppress GCC warning on RHEL 6. (Bug#11207)

[Paul Eggert]

------------------------------------------------------------
revno: 108851
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-03 17:36:28 -0700
message:
  * 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.
modified:
  src/ChangeLog
  src/regex.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-04 00:04:46 +0000
+++ b/src/ChangeLog     2012-07-04 00:36:28 +0000
@@ -1,5 +1,9 @@
 2012-07-04  Paul Eggert  <address@hidden>
 
+       * 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,

=== modified file 'src/regex.c'
--- a/src/regex.c       2012-06-26 01:05:39 +0000
+++ b/src/regex.c       2012-07-04 00:36:28 +0000
@@ -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"