From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnMkc-0007ZG-Oj for qemu-devel@nongnu.org; Wed, 29 Apr 2015 03:49:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnMkW-0008BY-Sx for qemu-devel@nongnu.org; Wed, 29 Apr 2015 03:49:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnMkW-0008BH-K3 for qemu-devel@nongnu.org; Wed, 29 Apr 2015 03:49:40 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3T7ndBf010046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 29 Apr 2015 03:49:39 -0400 From: Gerd Hoffmann Date: Wed, 29 Apr 2015 09:49:28 +0200 Message-Id: <1430293770-1965-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1430293770-1965-1-git-send-email-kraxel@redhat.com> References: <1430293770-1965-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] 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 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