From 1beeec74ae3c32b55966564045009398ead04ec8 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 10 Feb 2020 23:48:06 -0500 Subject: [PATCH] wayland: Fix building with -fno-common (which is now the default in GCC 10). Fixes Bugzilla #4957. --HG-- extra : rebase_source : 64466e107af6f0a6c825ba2e89fb45c30b531fd5 --- src/video/wayland/SDL_waylanddyn.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h index a4fed646c..485a9c19f 100644 --- a/src/video/wayland/SDL_waylanddyn.h +++ b/src/video/wayland/SDL_waylanddyn.h @@ -59,6 +59,9 @@ void SDL_WAYLAND_UnloadSymbols(void); } #endif +/* Must be included before our #defines, see Bugzilla #4957 */ +#include "wayland-client-core.h" + #ifdef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC #ifdef _WAYLAND_CLIENT_H @@ -99,7 +102,6 @@ void SDL_WAYLAND_UnloadSymbols(void); #endif /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */ -#include "wayland-client-core.h" #include "wayland-client-protocol.h" #include "wayland-egl.h"