diff options
| author | root <root@exodia.verona.se> | 2013-08-12 12:27:22 +0200 |
|---|---|---|
| committer | root <root@exodia.verona.se> | 2013-08-12 12:27:22 +0200 |
| commit | c39e73975f7371a6458cd63967d39ba77a1e871a (patch) | |
| tree | 145fb3d8489ecd65ac6b1887e17a204bff751286 /src/emacsgtkfixed.c | |
| parent | 2427b15992fe47646a2bf2b55891f1e482dedaa0 (diff) | |
| parent | 6edea0a595d292c4d3f1a7e862195be07c874e40 (diff) | |
| download | emacs-c39e73975f7371a6458cd63967d39ba77a1e871a.tar.gz | |
merge from trunk
Conflicts:
src/Makefile.in
Diffstat (limited to 'src/emacsgtkfixed.c')
| -rw-r--r-- | src/emacsgtkfixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index f675bd76d97..8635ab652ac 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -30,7 +30,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "xwidget.h" #endif /* 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 |