From patchwork Mon Jan 19 13:36:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 430534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2452F140082 for ; Tue, 20 Jan 2015 00:41:28 +1100 (AEDT) Received: from localhost ([::1]:37555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDCa6-0003Xx-DV for incoming@patchwork.ozlabs.org; Mon, 19 Jan 2015 08:41:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53030) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDCW0-0004jl-0U for qemu-devel@nongnu.org; Mon, 19 Jan 2015 08:37:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDCVm-0002xA-7t for qemu-devel@nongnu.org; Mon, 19 Jan 2015 08:37:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36071) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDCVl-0002wx-W5 for qemu-devel@nongnu.org; Mon, 19 Jan 2015 08:36:58 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t0JDat0g004732 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 19 Jan 2015 08:36:55 -0500 Received: from nilsson.home.kraxel.org (ovpn-116-72.ams2.redhat.com [10.36.116.72]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t0JDasSX022443; Mon, 19 Jan 2015 08:36:55 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 95B9D81AA5; Mon, 19 Jan 2015 14:36:52 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 19 Jan 2015 14:36:42 +0100 Message-Id: <1421674603-31575-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1421674603-31575-1-git-send-email-kraxel@redhat.com> References: <1421674603-31575-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann , Anthony Liguori , Max Reitz Subject: [Qemu-devel] [PATCH v2 6/7] sdl2: move SDL_* includes to sdl2.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 f56c596..148308c 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 9264817..7a82d50 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 1ae2781..943d1da 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"