From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v5 04/18] ui: avoid warnings about directdb on Alpine / musl libc
Date: Wed, 15 Dec 2021 14:19:35 +0000 [thread overview]
Message-ID: <20211215141949.3512719-5-berrange@redhat.com> (raw)
In-Reply-To: <20211215141949.3512719-1-berrange@redhat.com>
On Alpine, SDL is built with directfb support and this triggers warnings
during QEMU build
In file included from /usr/include/directfb/direct/thread.h:38,
from /usr/include/directfb/direct/debug.h:43,
from /usr/include/directfb/direct/interface.h:36,
from /usr/include/directfb/directfb.h:49,
from /usr/include/SDL2/SDL_syswm.h:80,
from /builds/berrange/qemu/include/ui/sdl2.h:8,
from ../ui/sdl2-gl.c:31:
/usr/include/directfb/direct/os/waitqueue.h:41:25: error: redundant redeclaration of 'direct_waitqueue_init' [-Werror=redundant-decls]
41 | DirectResult DIRECT_API direct_waitqueue_init ( DirectWaitQueue *queue );
| ^~~~~~~~~~~~~~~~~~~~~
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
include/ui/sdl2.h | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
index f85c117a78..0330978df8 100644
--- a/include/ui/sdl2.h
+++ b/include/ui/sdl2.h
@@ -5,7 +5,18 @@
#undef WIN32_LEAN_AND_MEAN
#include <SDL.h>
+
+/* with Alpine / muslc SDL headers pull in directfb headers
+ * which in turn trigger warning about redundant decls for
+ * direct_waitqueue_deinit.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+
#include <SDL_syswm.h>
+
+#pragma GCC diagnostic pop
+
#ifdef CONFIG_SDL_IMAGE
# include <SDL_image.h>
#endif
--
2.33.1
next prev parent reply other threads:[~2021-12-15 14:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 14:19 [PATCH v5 00/18] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 01/18] ui: avoid compiler warnings from unused clipboard info variable Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 02/18] spice: Update QXLInterface for spice >= 0.15.0 Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 03/18] meson: require liburing >= 0.3 Daniel P. Berrangé
2021-12-15 14:19 ` Daniel P. Berrangé [this message]
2021-12-15 14:19 ` [PATCH v5 05/18] ci: explicitly skip I/O tests on alpine Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 06/18] tests/docker: switch fedora image to release 35 Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 07/18] tests: integrate lcitool for generating build env manifests Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 08/18] tests/docker: auto-generate centos8.docker with lcitool Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 09/18] tests/docker: auto-generate fedora.docker " Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 10/18] tests/docker: auto-generate ubuntu1804.docker " Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 11/18] tests/docker: auto-generate ubuntu2004.docker " Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 12/18] tests/docker: auto-generate opensuse-leap.docker " Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 13/18] tests/docker: remove ubuntu.docker container Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 14/18] .gitlab-ci.d/cirrus: auto-generate variables with lcitool Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 15/18] tests/docker: updates to alpine package list Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 16/18] tests/docker: fix sorting of alpine image package lists Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 17/18] tests/docker: fully expand the alpine package list Daniel P. Berrangé
2021-12-15 14:19 ` [PATCH v5 18/18] tests/docker: auto-generate alpine.docker with lcitool Daniel P. Berrangé
2022-01-05 9:33 ` [PATCH v5 00/18] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211215141949.3512719-5-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).