X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b7a6f9f7919b7fc0871ae768b58f8e746aa7dd9f..e7db8e8d5de70be5e047c961cdfbf692d52e33c6:/src/emacsgtkfixed.c diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 970683da9c..abec78fb07 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-2013 Free Software Foundation, Inc. +Copyright (C) 2011-2015 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -20,15 +20,13 @@ along with GNU Emacs. If not, see . */ #include -#include "emacsgtkfixed.h" -#include - #include "lisp.h" #include "frame.h" #include "xterm.h" +#include "emacsgtkfixed.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