diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-12 18:22:08 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-12 18:22:08 -0700 |
| commit | 5f0cb45a6f6af1dea4d41f5da86fc3e36828c6d0 (patch) | |
| tree | 565222c36e1b65bb7f389913a186fdddbf79cca1 /src/emacsgtkfixed.c | |
| parent | 40bce90baad677cd631c27819b32cca9c5d3a1ab (diff) | |
| download | emacs-5f0cb45a6f6af1dea4d41f5da86fc3e36828c6d0.tar.gz emacs-5f0cb45a6f6af1dea4d41f5da86fc3e36828c6d0.tar.bz2 emacs-5f0cb45a6f6af1dea4d41f5da86fc3e36828c6d0.zip | |
Work around GCC and GNOME bugs when --enable-gcc-warnings.
* emacsgtkfixed.c (G_STATIC_ASSERT): Redefine to use 'verify',
to work around GNOME bug 683906.
* image.c (jpeg_load_body) [HAVE_JPEG && lint]: Pacify gcc -Wclobber.
(struct my_jpeg_error_mgr) [HAVE_JPEG && lint]: New member fp.
This works around GCC bug 54561.
Diffstat (limited to 'src/emacsgtkfixed.c')
| -rw-r--r-- | src/emacsgtkfixed.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 940482654b3..a21d0f8a422 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c @@ -27,6 +27,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "frame.h" #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) + #define EMACS_TYPE_FIXED emacs_fixed_get_type () #define EMACS_FIXED(obj) \ G_TYPE_CHECK_INSTANCE_CAST (obj, EMACS_TYPE_FIXED, EmacsFixed) |