aboutsummaryrefslogtreecommitdiff
path: root/include/ui/sdl2.h
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2022-01-05 13:49:39 +0000
committerAlex Bennée <alex.bennee@linaro.org>2022-01-18 16:42:41 +0000
commit021e3fa33b57612fd0e1a6b7ced23d3480cfbdca (patch)
tree82f31d710be37a4467b85237dd96882c6e258542 /include/ui/sdl2.h
parenta41b4fdc445f1aad5f8bdbb36b351415647f91fc (diff)
downloadqemu-021e3fa33b57612fd0e1a6b7ced23d3480cfbdca.zip
qemu-021e3fa33b57612fd0e1a6b7ced23d3480cfbdca.tar.gz
qemu-021e3fa33b57612fd0e1a6b7ced23d3480cfbdca.tar.bz2
ui: avoid warnings about directdb on Alpine / musl libc
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> Message-Id: <20220105135009.1584676-5-alex.bennee@linaro.org>
Diffstat (limited to 'include/ui/sdl2.h')
-rw-r--r--include/ui/sdl2.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
index 71bcf7e..8fb7e08 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