From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz1ZQ-0005Jw-Cb for qemu-devel@nongnu.org; Thu, 11 Dec 2014 06:06:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xz1ZK-0004o1-6y for qemu-devel@nongnu.org; Thu, 11 Dec 2014 06:06:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xz1ZJ-0004no-Uq for qemu-devel@nongnu.org; Thu, 11 Dec 2014 06:06:02 -0500 From: Gerd Hoffmann Date: Thu, 11 Dec 2014 12:05:56 +0100 Message-Id: <1418295956-22479-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1418295956-22479-1-git-send-email-kraxel@redhat.com> References: <1418295956-22479-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [RfC PATCH 3/3] 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 ba90a91..0b63556 100644 --- a/include/ui/sdl2.h +++ b/include/ui/sdl2.h @@ -1,3 +1,10 @@ +/* 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 30018d4..3046d2d 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 6702e8e..252f099 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 1e14a2a..24e4c9a 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