From patchwork Thu Apr 1 14:20:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 49217 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BA2BEB7CF3 for ; Fri, 2 Apr 2010 01:24:07 +1100 (EST) Received: from localhost ([127.0.0.1]:51953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxLH8-0006tg-4l for incoming@patchwork.ozlabs.org; Thu, 01 Apr 2010 10:21:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NxLFu-0006pZ-Gc for qemu-devel@nongnu.org; Thu, 01 Apr 2010 10:20:22 -0400 Received: from [140.186.70.92] (port=57599 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NxLFt-0006kn-2l for qemu-devel@nongnu.org; Thu, 01 Apr 2010 10:20:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NxLFr-0004vl-Fk for qemu-devel@nongnu.org; Thu, 01 Apr 2010 10:20:20 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:65198) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NxLFr-0004vE-51 for qemu-devel@nongnu.org; Thu, 01 Apr 2010 10:20:19 -0400 Received: from flocke.weilnetz.de (p54ADFAC7.dip.t-dialin.net [84.173.250.199]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MP3ch-1NsgY90Vq3-0061ZK; Thu, 01 Apr 2010 16:20:10 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1NxLFh-0003Q2-36; Thu, 01 Apr 2010 16:20:09 +0200 From: Stefan Weil To: QEMU Developers Date: Thu, 1 Apr 2010 16:20:07 +0200 Message-Id: <1270131607-13114-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.0 X-Provags-ID: V01U2FsdGVkX1/0cLv/qFgGxp9VpHi2PiINHlWXwsEjo5hLMhA g8LrGVjIv37bYa+u54HwKiErrqoJkalCggQYS23WBhxt9sxIjw t8q57n3bj9ORTKqNPtufyVVxSBGdpSamohwdEOP4Nt8+ttbjAd qHg== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] win32: Avoid compiler warning (WIN32_LEAN_AND_MEAN redefined) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org configure adds the macro WIN32_LEAN_AND_MEAN to QEMU_CFLAGS, and SDL_syswm.h defines it, too. This results in a compiler warning (redefinition of WIN32_LEAN_AND_MEAN in SDL_syswm.h. That warning prevents compilations for win32 with warning = error). Fix this by removing the definition of WIN32_LEAN_AND_MEAN before including SDL_syswm.h. Signed-off-by: Stefan Weil --- sdl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sdl.c b/sdl.c index 16a48e9..0334b4b 100644 --- a/sdl.c +++ b/sdl.c @@ -21,6 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + +/* Avoid compiler warning because macro is redefined in SDL_syswm.h. */ +#undef WIN32_LEAN_AND_MEAN + #include #include