X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/1068fe4d1bde1f532aedb612244f0f3c4ad555be..0e963201d03d9229bb8ac4323291d2b0119526ed:/src/emacsgtkfixed.c
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 1a62b59b7a..cdcaf803ba 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -1,7 +1,7 @@
/* A Gtk Widget that inherits GtkFixed, but can be shrunk.
This file is only use when compiling with Gtk+ 3.
-Copyright (C) 2011-2012 Free Software Foundation, Inc.
+Copyright (C) 2011-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -20,13 +20,16 @@ along with GNU Emacs. If not, see . */
#include
-#include "emacsgtkfixed.h"
-#include
-#include
-#include
#include "lisp.h"
#include "frame.h"
#include "xterm.h"
+#include "emacsgtkfixed.h"
+
+/* Silence a bogus diagnostic; see GNOME bug 683906. */
+#if 4 < __GNUC__ + (7 <= __GNUC_MINOR__)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif
#define EMACS_TYPE_FIXED emacs_fixed_get_type ()
#define EMACS_FIXED(obj) \