From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSlbf-0004jm-Uj for qemu-devel@nongnu.org; Tue, 03 Mar 2015 07:07:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YSlbW-0005cu-QX for qemu-devel@nongnu.org; Tue, 03 Mar 2015 07:07:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YSlbW-0005ce-Ib for qemu-devel@nongnu.org; Tue, 03 Mar 2015 07:07:14 -0500 From: Gerd Hoffmann Date: Tue, 3 Mar 2015 13:07:06 +0100 Message-Id: <1425384427-2551-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1425384427-2551-1-git-send-email-kraxel@redhat.com> References: <1425384427-2551-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/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 Reviewed-by: Max Reitz --- 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 +#include + 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 -#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 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 -#include - #include "qemu-common.h" #include "ui/console.h" #include "ui/input.h" -- 1.8.3.1