[Emacs-diffs] trunk r113500: * emacsgtkfixed.c: Port to GCC 4.6.

[Paul Eggert]

------------------------------------------------------------
revno: 113500
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-07-23 07:38:51 +0100
message:
  * emacsgtkfixed.c: Port to GCC 4.6.
  
  GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacsgtkfixed.c            
emacsgtkfixed.c-20110614203741-zy59ua04aeb4gvn1-1

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-23 01:11:40 +0000
+++ b/src/ChangeLog     2013-07-23 06:38:51 +0000
@@ -1,3 +1,8 @@
+2013-07-23  Paul Eggert  <address@hidden>
+
+       * emacsgtkfixed.c: Port to GCC 4.6.
+       GCC 4.6 complains about -Wunused-local-typedefs, introduced in 4.7.
+
 2013-07-23  Juanma Barranquero  <address@hidden>
 
        * callproc.c (child_setup)[!WINDOWSNT]: Move exec_errno and pid

=== modified file 'src/emacsgtkfixed.c'
--- a/src/emacsgtkfixed.c       2013-03-24 12:59:45 +0000
+++ b/src/emacsgtkfixed.c       2013-07-23 06:38:51 +0000
@@ -28,7 +28,7 @@
 #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