[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 04/34] ui: avoid warnings about directdb on Alpine / musl libc
From: |
Alex Bennée |
Subject: |
[PATCH v1 04/34] ui: avoid warnings about directdb on Alpine / musl libc |
Date: |
Wed, 5 Jan 2022 13:49:39 +0000 |
From: Daniel P. Berrangé <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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20211215141949.3512719-5-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 71bcf7ebda..8fb7e08262 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.30.2
- [PATCH v1 00/34] testing/next and other misc fixes, Alex Bennée, 2022/01/05
- [PATCH v1 01/34] ui: avoid compiler warnings from unused clipboard info variable, Alex Bennée, 2022/01/05
- [PATCH v1 03/34] meson: require liburing >= 0.3, Alex Bennée, 2022/01/05
- [PATCH v1 02/34] spice: Update QXLInterface for spice >= 0.15.0, Alex Bennée, 2022/01/05
- [PATCH v1 08/34] tests/docker: auto-generate centos8.docker with lcitool, Alex Bennée, 2022/01/05
- [PATCH v1 04/34] ui: avoid warnings about directdb on Alpine / musl libc,
Alex Bennée <=
- [PATCH v1 06/34] tests/docker: switch fedora image to release 35, Alex Bennée, 2022/01/05
- [PATCH v1 07/34] tests: integrate lcitool for generating build env manifests, Alex Bennée, 2022/01/05
- [PATCH v1 19/34] tests/tcg: use CONFIG_LINUX_USER, not CONFIG_LINUX, Alex Bennée, 2022/01/05
- [PATCH v1 15/34] tests/docker: updates to alpine package list, Alex Bennée, 2022/01/05
- [PATCH v1 05/34] ci: explicitly skip I/O tests on alpine, Alex Bennée, 2022/01/05
- [PATCH v1 09/34] tests/docker: auto-generate fedora.docker with lcitool, Alex Bennée, 2022/01/05
- [PATCH v1 11/34] tests/docker: auto-generate ubuntu2004.docker with lcitool, Alex Bennée, 2022/01/05