From: Joakim Verona <joakim@verona.se>
Date: Tue, 26 Mar 2013 15:14:01 +0000 (+0100)
Subject: auto upstream
X-Git-Tag: emacs-25.0.90~2939^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48c226c2c2592e31a47559bd1689fcc4354d9479;p=emacs.git

auto upstream
---

48c226c2c2592e31a47559bd1689fcc4354d9479
diff --cc src/emacsgtkfixed.c
index 9eedb57c81c,970683da9c4..6df0b2422b1
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@@ -26,11 -26,9 +26,11 @@@ along with GNU Emacs.  If not, see <htt
  #include "lisp.h"
  #include "frame.h"
  #include "xterm.h"
 -
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
  /* Silence a bogus diagnostic; see GNOME bug 683906.  */
- #if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+ #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
  # pragma GCC diagnostic push
  # pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif