From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 23 Jul 2013 06:38:51 +0000 (+0100)
Subject: * emacsgtkfixed.c: Port to GCC 4.6.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1728
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ca960e27a653f6dcaf057eefc5243bf4c223e72;p=emacs.git

* emacsgtkfixed.c: Port to GCC 4.6.

GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 1423b9d366e..97d9cc9f41d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* emacsgtkfixed.c: Port to GCC 4.6.
+	GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7.
+
 2013-07-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* callproc.c (child_setup)[!WINDOWSNT]: Move exec_errno and pid
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 970683da9c4..8b19d89f3a0 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -28,7 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "xterm.h"
 
 /* Silence a bogus diagnostic; see GNOME bug 683906.  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#if 4 < __GNUC__ + (7 <= __GNUC_MINOR__)
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored "-Wunused-local-typedefs"
 #endif