diff options
| author | Joakim Verona | 2013-09-10 23:52:26 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-10 23:52:26 +0200 |
| commit | 63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c (patch) | |
| tree | e5078c5545c777e21944a9ee4199a6f2c6d25ca9 /src/emacsgtkfixed.c | |
| parent | 92aeabcc8a007f521a664e3aee092eb80ad0f49a (diff) | |
| download | emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.tar.gz emacs-63dae8e97d343fd4ebfe3dc08f0e8dc932630a4c.zip | |
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/>. */ | |||
| 20 | 20 | ||
| 21 | #include <config.h> | 21 | #include <config.h> |
| 22 | 22 | ||
| 23 | #include "emacsgtkfixed.h" | ||
| 24 | #include <stdio.h> | ||
| 25 | |||
| 26 | #include "lisp.h" | 23 | #include "lisp.h" |
| 27 | #include "frame.h" | 24 | #include "frame.h" |
| 28 | #include "xterm.h" | 25 | #include "xterm.h" |
| 29 | #ifdef HAVE_XWIDGETS | 26 | #ifdef HAVE_XWIDGETS |
| 30 | #include "xwidget.h" | 27 | #include "xwidget.h" |
| 31 | #endif | 28 | #endif |
| 29 | #include "emacsgtkfixed.h" | ||
| 30 | |||
| 32 | /* Silence a bogus diagnostic; see GNOME bug 683906. */ | 31 | /* Silence a bogus diagnostic; see GNOME bug 683906. */ |
| 33 | #if 4 < __GNUC__ + (7 <= __GNUC_MINOR__) | 32 | #if 4 < __GNUC__ + (7 <= __GNUC_MINOR__) |
| 34 | # pragma GCC diagnostic push | 33 | # pragma GCC diagnostic push |