[Emacs-diffs] /srv/bzr/emacs/trunk r110007: Better workaround for GNOME bug when --enable-gcc-warnings.

[Paul Eggert]

------------------------------------------------------------
revno: 110007
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-09-12 21:14:33 -0700
message:
  Better workaround for GNOME bug when --enable-gcc-warnings.
  
  * emacsgtkfixed.c (G_STATIC_ASSERT): Remove, undoing last change.
  Instead, disable -Wunused-local-typedefs.  See Dmitry Antipov in
  <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00335.html>.
modified:
  src/ChangeLog
  src/emacsgtkfixed.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-13 02:21:28 +0000
+++ b/src/ChangeLog     2012-09-13 04:14:33 +0000
@@ -1,5 +1,10 @@
 2012-09-13  Paul Eggert  <address@hidden>
 
+       Better workaround for GNOME bug when --enable-gcc-warnings.
+       * emacsgtkfixed.c (G_STATIC_ASSERT): Remove, undoing last change.
+       Instead, disable -Wunused-local-typedefs.  See Dmitry Antipov in
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00335.html>.
+
        Simplify SIGIO usage (Bug#12408).
        The code that dealt with SIGIO was crufty and confusing, e.g., it
        played tricks like "#undef SIGIO" but these tricks were not used

=== modified file 'src/emacsgtkfixed.c'
--- a/src/emacsgtkfixed.c       2012-09-13 01:22:08 +0000
+++ b/src/emacsgtkfixed.c       2012-09-13 04:14:33 +0000
@@ -28,9 +28,10 @@
 #include "xterm.h"
 
 /* Silence a bogus diagnostic; see GNOME bug 683906.  */
-#include <verify.h>
-#undef G_STATIC_ASSERT
-#define G_STATIC_ASSERT(x) verify (x)
+#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif
 
 #define EMACS_TYPE_FIXED emacs_fixed_get_type ()
 #define EMACS_FIXED(obj) \