diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-04-16 13:51:06 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-17 10:28:04 -0500 |
| commit | e6f53fd514bbdcf63a5905536ff4d0effc146742 (patch) | |
| tree | 47f575d74fe606c150cd5909ee3b8f8be98b7765 /include/ui | |
| parent | bf2a38d41e304ccd92191327248fd32f14ff11d2 (diff) | |
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 'include/ui')
| -rw-r--r-- | include/ui/qemu-pixman.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index f012ec5fc3..ba970f813b 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -8,11 +8,12 @@ /* pixman-0.16.0 headers have a redundant declaration */ #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE +#pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wredundant-decls" #endif #include <pixman.h> #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE -#pragma GCC diagnostic error "-Wredundant-decls" +#pragma GCC diagnostic pop #endif #include "qemu/typedefs.h" |