diff options
| author | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
|---|---|---|
| committer | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
| commit | 39372e1a1032521be74575bb06f95a3898fbae30 (patch) | |
| tree | 754bd242a23d2358ea116126fcb0a629947bd9ec /src/emacsgtkfixed.c | |
| parent | 6a3121904d76e3b2f63007341d48c5c1af55de80 (diff) | |
| parent | e11aaee266da52937a3a031cb108fe13f68958c3 (diff) | |
| download | emacs-39372e1a1032521be74575bb06f95a3898fbae30.tar.gz | |
merge from trunk
Diffstat (limited to 'src/emacsgtkfixed.c')
| -rw-r--r-- | src/emacsgtkfixed.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 8b19d89f3a0..abec78fb073 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,12 +20,10 @@ 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" +#include "emacsgtkfixed.h" /* Silence a bogus diagnostic; see GNOME bug 683906. */ #if 4 < __GNUC__ + (7 <= __GNUC_MINOR__) |
