Commit 4378fcd9a77b22488f793511a758e9b68fdf02d2

Ryan C. Gordon 2020-02-10T23:48:06

wayland: Fix building with -fno-common (which is now the default in GCC 10). Fixes Bugzilla #4957.

diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
index a4fed64..485a9c1 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"