diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2013-02-22 21:08:51 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-22 14:48:24 -0600 |
| commit | c95e3080a44946ac5739542b549f5a10ee4ec377 (patch) | |
| tree | 9e2912939a2bb74bb52f0572a7c8e5beff5c3253 /ui | |
| parent | 5cbb08283789caf7dbfd0890dcff47124ad766c2 (diff) | |
| download | qemu-c95e3080a44946ac5739542b549f5a10ee4ec377.tar.gz qemu-c95e3080a44946ac5739542b549f5a10ee4ec377.tar.bz2 qemu-c95e3080a44946ac5739542b549f5a10ee4ec377.zip | |
Reenable -Wstrict-prototypes
One part of this patch reverts commit 22bc9a46, which disabled the
warning. The rest of it deals with the warning by adding a #pragma for
newer gcc and by disabling -Werror for compilers that can't deal with
the #pragma.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1361563731-13307-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -34,7 +34,18 @@ #define GETTEXT_PACKAGE "qemu" #define LOCALEDIR "po" +#include "qemu-common.h" + +#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE +/* Work around an -Wstrict-prototypes warning in GTK headers */ +#pragma GCC diagnostic ignored "-Wstrict-prototypes" +#endif #include <gtk/gtk.h> +#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE +#pragma GCC diagnostic error "-Wstrict-prototypes" +#endif + + #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> #include <locale.h> @@ -46,7 +57,6 @@ #include <pty.h> #include <math.h> -#include "qemu-common.h" #include "ui/console.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" |