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>.

diff --git a/src/ChangeLog b/src/ChangeLog
index c8588b973f8942d2e2a2a2db01b9d484aa891a54..2bc041f04358d462dc7aaf6d4314b97b7891fdb2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+       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

diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index a21d0f8a4222edf3e9bc6d59b431aa5fd21c0d11..c0d29a640ed2cda65613d57c7eef2849c122a50b 100644 (file)
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -28,9 +28,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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) \