From patchwork Sun Apr 15 14:13:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 152625 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B9565B6EE6 for ; Mon, 16 Apr 2012 01:09:23 +1000 (EST) Received: from localhost ([::1]:51938 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJQEA-0005Sp-NI for incoming@patchwork.ozlabs.org; Sun, 15 Apr 2012 10:14:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJQDR-0003ET-Uo for qemu-devel@nongnu.org; Sun, 15 Apr 2012 10:14:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SJQDQ-0008Ep-2j for qemu-devel@nongnu.org; Sun, 15 Apr 2012 10:14:09 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:36150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJQDP-0008Cn-T5 for qemu-devel@nongnu.org; Sun, 15 Apr 2012 10:14:08 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id BD85F72800B7; Sun, 15 Apr 2012 16:14:06 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HnBO0D-MWiTK; Sun, 15 Apr 2012 16:14:06 +0200 (CEST) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id 872CB72800BB; Sun, 15 Apr 2012 16:14:05 +0200 (CEST) From: Stefan Weil To: qemu-devel@nongnu.org Date: Sun, 15 Apr 2012 16:13:41 +0200 Message-Id: <1334499233-6344-9-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1334499233-6344-1-git-send-email-sw@weilnetz.de> References: <1334499233-6344-1-git-send-email-sw@weilnetz.de> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.47.199.172 Cc: Blue Swirl , Stefan Weil Subject: [Qemu-devel] [PATCH 08/20] w64: Undefine macro SYS_OPEN (fixes a compiler warning) 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 This could also be done in arm-semi.c, but doing it here keeps more w64 related code in one place. Signed-off-by: Stefan Weil --- qemu-os-win32.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/qemu-os-win32.h b/qemu-os-win32.h index 753679b..99e8423 100644 --- a/qemu-os-win32.h +++ b/qemu-os-win32.h @@ -65,6 +65,10 @@ # define setjmp(env) _setjmp(env, NULL) #endif +/* MinGW-w64 defines SYS_OPEN in stdio.h, + * but arm-semi.c uses a different definition. */ +#undef SYS_OPEN + /* Declaration of ffs() is missing in MinGW's strings.h. */ int ffs(int i);