Signed-off-by: Gerd Hoffmann <kra...@redhat.com> Reviewed-by: Max Reitz <mre...@redhat.com> --- include/ui/sdl2.h | 6 ++++++ ui/sdl2-2d.c | 6 ------ ui/sdl2-input.c | 6 ------ ui/sdl2.c | 6 ------ 4 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index 51fff2e..e21783a 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -1,6 +1,12 @@ #ifndef SDL2_H #define SDL2_H +/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */ +#undef WIN32_LEAN_AND_MEAN + +#include <SDL.h> +#include <SDL_syswm.h> + struct sdl2_console { DisplayChangeListener dcl; DisplaySurface *surface; diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index f907c21..46ef5f7 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -23,12 +23,6 @@ */ /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */ -/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */ -#undef WIN32_LEAN_AND_MEAN - -#include <SDL.h> -#include <SDL_syswm.h> - #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/sdl2-input.c b/ui/sdl2-input.c index a1973fc..ac5dc94 100644 --- a/ui/sdl2-input.c +++ b/ui/sdl2-input.c @@ -23,12 +23,6 @@ */ /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */ -/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */ -#undef WIN32_LEAN_AND_MEAN - -#include <SDL.h> -#include <SDL_syswm.h> - #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/sdl2.c b/ui/sdl2.c index 60e3c3b..610ddb0 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -23,12 +23,6 @@ */ /* Ported SDL 1.2 code to 2.0 by Dave Airlie. */ -/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */ -#undef WIN32_LEAN_AND_MEAN - -#include <SDL.h> -#include <SDL_syswm.h> - #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" -- 1.8.3.1