diff options
author | Joakim Verona <joakim@verona.se> | 2013-09-10 23:52:26 +0200 |
---|---|---|
committer | Joakim Verona <joakim@verona.se> | 2013-09-10 23:52:26 +0200 |
commit | 63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c (patch) | |
tree | e5078c5545c777e21944a9ee4199a6f2c6d25ca9 /src/emacsgtkfixed.c | |
parent | 92aeabcc8a007f521a664e3aee092eb80ad0f49a (diff) | |
download | emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.tar.gz |
merge upstream
Diffstat (limited to 'src/emacsgtkfixed.c')
-rw-r--r-- | src/emacsgtkfixed.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 8635ab652ac..1e57eeb57c4 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -20,15 +20,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> -#include "emacsgtkfixed.h" -#include <stdio.h> - #include "lisp.h" #include "frame.h" #include "xterm.h" #ifdef HAVE_XWIDGETS #include "xwidget.h" #endif +#include "emacsgtkfixed.h" + /* Silence a bogus diagnostic; see GNOME bug 683906. */ #if 4 < __GNUC__ + (7 <= __GNUC_MINOR__) # pragma GCC diagnostic push |