summaryrefslogtreecommitdiffstats
path: root/ui/gtk.c
diff options
context:
space:
mode:
authorMarkus Armbruster2013-04-16 13:51:06 +0200
committerAnthony Liguori2013-04-17 17:28:04 +0200
commite6f53fd514bbdcf63a5905536ff4d0effc146742 (patch)
tree47f575d74fe606c150cd5909ee3b8f8be98b7765 /ui/gtk.c
parentfw_cfg: add qtest test case (diff)
downloadqemu-e6f53fd514bbdcf63a5905536ff4d0effc146742.tar.gz
qemu-e6f53fd514bbdcf63a5905536ff4d0effc146742.tar.xz
qemu-e6f53fd514bbdcf63a5905536ff4d0effc146742.zip
Fix warnings suppressors to honor --disable-werror
Replace #pragma GCC diagnostic ignored FOO [Troublesome code...] #pragma GCC diagnostic error FOO by #pragma GCC diagnostic push #pragma GCC diagnostic ignored FOO [Troublesome code...] #pragma GCC diagnostic pop Broken in commit 3f4349d, commit 092bb30, and commit c95e308. Signed-off-by: Markus Armbruster <armbru@redhat.com> Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1366113066-1340-1-git-send-email-armbru@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'ui/gtk.c')
-rw-r--r--ui/gtk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/gtk.c b/ui/gtk.c
index d48529a34f..b46997a91a 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -38,11 +38,12 @@
#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
/* Work around an -Wstrict-prototypes warning in GTK headers */
+#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
#endif
#include <gtk/gtk.h>
#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
-#pragma GCC diagnostic error "-Wstrict-prototypes"
+#pragma GCC diagnostic pop
#endif