From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAeDb-0004y8-Ut for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:35:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YAeDV-0003g9-LF for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:35:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAeDV-0003fu-D9 for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:35:33 -0500 From: Gerd Hoffmann Date: Mon, 12 Jan 2015 13:35:26 +0100 Message-Id: <1421066126-25737-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1421066126-25737-1-git-send-email-kraxel@redhat.com> References: <1421066126-25737-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] sdl2: move SDL_* includes to sdl2.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori Signed-off-by: Gerd Hoffmann --- include/ui/sdl2.h | 7 +++++++ ui/sdl2-2d.c | 6 ------ ui/sdl2-gl.c | 7 ------- ui/sdl2-input.c | 6 ------ ui/sdl2.c | 6 ------ 5 files changed, 7 insertions(+), 25 deletions(-) diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h index 5c962da..a80b3a1 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -1,6 +1,13 @@ #ifndef SDL2_H #define SDL2_H +/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */ +#undef WIN32_LEAN_AND_MEAN + +#include +#include +#include + struct sdl2_console { DisplayChangeListener dcl; DisplaySurface *surface; diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index 85f1be4..f6cb438 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 -#include - #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index b8620ca..6de01ad 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -23,13 +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 -#include -#include - #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 -#include - #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" diff --git a/ui/sdl2.c b/ui/sdl2.c index 7dd8a87..3be9de7 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 -#include - #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" -- 1.8.3.1