diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-13 13:01:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-13 13:01:30 +0100 |
| commit | 00ce6c36b35e0eb8cc5d68a28f288a6335848813 (patch) | |
| tree | ca25062dd798548f1c0bfe53e8dc278de5beaf32 /include | |
| parent | 6c87d9f311dba0641bdc2df556056938a8bf2a12 (diff) | |
| parent | 2a84f48c2b387877422ee85f6425d2c1b25bace0 (diff) | |
| download | qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.zip qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.tar.gz qemu-00ce6c36b35e0eb8cc5d68a28f288a6335848813.tar.bz2 | |
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-13' into staging
* Some fuzzer related fixes
* Fixes / improvements for the "configure" script
* Doc updates
* Gitlab pipeline-status script
# gpg: Signature made Mon 13 Jul 2020 11:48:32 BST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth-gitlab/tags/pull-request-2020-07-13:
docs/system/s390x: Improve the 3270 documentation
GitLab Gating CI: introduce pipeline-status contrib script
disas/sh4: Add missing fallthrough annotations
Remove the CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE switch
docs/devel/fuzzing: Fix bugs in documentation
tests/qtest/fuzz: Add missing spaces in description
fuzz: add missing header for rcu_enable_atfork
configure: do not clobber CFLAGS with --enable-fuzzing
configure: fix malloc check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/gtk.h | 4 | ||||
| -rw-r--r-- | include/ui/qemu-pixman.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/ui/gtk.h b/include/ui/gtk.h index d1b2308..eaeb450 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -1,15 +1,11 @@ #ifndef UI_GTK_H #define UI_GTK_H -#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 pop -#endif #include <gdk/gdkkeysyms.h> diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h index 3b7cf70..87737a6 100644 --- a/include/ui/qemu-pixman.h +++ b/include/ui/qemu-pixman.h @@ -7,14 +7,10 @@ #define QEMU_PIXMAN_H /* 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 pop -#endif /* * pixman image formats are defined to be native endian, |