Better workaround for GNOME bug when --enable-gcc-warnings.

* emacsgtkfixed.c (G_STATIC_ASSERT): Remove, undoing last change.
Instead, disable -Wunused-local-typedefs.  See Dmitry Antipov in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00335.html>.
This commit is contained in:
Paul Eggert 2012-09-12 21:14:33 -07:00
parent 2168fe4f2a
commit 8ea47e3a50
2 changed files with 9 additions and 3 deletions

View file

@ -1,5 +1,10 @@
2012-09-13 Paul Eggert <eggert@cs.ucla.edu>
Better workaround for GNOME bug when --enable-gcc-warnings.
* emacsgtkfixed.c (G_STATIC_ASSERT): Remove, undoing last change.
Instead, disable -Wunused-local-typedefs. See Dmitry Antipov in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00335.html>.
Simplify SIGIO usage (Bug#12408).
The code that dealt with SIGIO was crufty and confusing, e.g., it
played tricks like "#undef SIGIO" but these tricks were not used

View file

@ -28,9 +28,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "xterm.h"
/* Silence a bogus diagnostic; see GNOME bug 683906. */
#include <verify.h>
#undef G_STATIC_ASSERT
#define G_STATIC_ASSERT(x) verify (x)
#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#endif
#define EMACS_TYPE_FIXED emacs_fixed_get_type ()
#define EMACS_FIXED(obj) \