From patchwork Mon Oct 31 10:23:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 122774 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D345FB6F6F for ; Mon, 31 Oct 2011 21:24:29 +1100 (EST) Received: from localhost ([::1]:49851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKp2T-0001Br-4D for incoming@patchwork.ozlabs.org; Mon, 31 Oct 2011 06:24:21 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKp2M-0001BS-Ng for qemu-devel@nongnu.org; Mon, 31 Oct 2011 06:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKp2L-0001qA-CO for qemu-devel@nongnu.org; Mon, 31 Oct 2011 06:24:14 -0400 Received: from fmmailgate05.web.de ([217.72.192.243]:44506) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKp2L-0001q2-1l for qemu-devel@nongnu.org; Mon, 31 Oct 2011 06:24:13 -0400 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate05.web.de (Postfix) with ESMTP id 5BBCC67241B5 for ; Mon, 31 Oct 2011 11:24:12 +0100 (CET) Received: from localhost.localdomain ([93.69.10.151]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0MPGym-1RPCks0N2u-004QII; Mon, 31 Oct 2011 11:24:11 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 31 Oct 2011 11:23:36 +0100 Message-Id: <1320056616-295-3-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.0.3 In-Reply-To: <1320056616-295-1-git-send-email-andreas.faerber@web.de> References: <1320056616-295-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:8dFOmFQNtYs7kStE8LbL8Y9LlKdrqwPZi7xr2Q7s/S0 +8joW1h/edMPM3h7XhdrkWsp9WgL00tcI6aEVcvh2Xl/BfWw6+ oT0DwHQsNUMbRaV7DbDI0AoE1rGxTxrScD9eBnmvzSst9YZScU O3zjEKBWhivkLRRZoOT4nKTI/mmLAa9oI1BLjng1+Ah++Ezjhg x/yn2bMBltJWa8hsenfcg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.243 Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Juan Pineda Subject: [Qemu-devel] [PATCH 2/2] softfloat: Avoid uint16 type conflict on Darwin 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 In file included from ./bswap.h:7, from ./qemu-common.h:106, from ./qemu-aio.h:17, from ./Block.h:4, from /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/FSEvents.h:28, from /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/CarbonCore.h:218, from /System/Library/Frameworks/CoreServices.framework/Frameworks/AE.framework/Headers/AE.h:20, from /System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h:21, from /System/Library/Frameworks/Foundation.framework/Headers/NSURLError.h:17, from /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h:81, from /System/Library/Frameworks/Cocoa.framework/Headers/Cocoa.h:12, from ui/cocoa.m:25: /Users/andreas/QEMU/qemu/fpu/softfloat.h:60: error: conflicting types for ‘uint16’ /System/Library/Frameworks/Security.framework/Headers/cssmconfig.h:73: error: previous declaration of ‘uint16’ was here make: *** [ui/cocoa.o] Error 1 Apple's FSEvents.h has #include , which wants /usr/include/Block.h but due to case-insensitive file system and include path jungle gets QEMU's ./block.h, which in turn includes softfloat.h indirectly. Therefore work around the conflict in softfloat.h itself by renaming specifically uint16 on Darwin to qemu_uint16. This fixes the build until we have a more general solution. Signed-off-by: Andreas Färber Cc: Juan Pineda Cc: Peter Maydell --- fpu/softfloat.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/fpu/softfloat.h b/fpu/softfloat.h index 07c2929..5320945 100644 --- a/fpu/softfloat.h +++ b/fpu/softfloat.h @@ -54,6 +54,9 @@ these four paragraphs for those parts of this code that are retained. | to the same as `int'. *----------------------------------------------------------------------------*/ typedef uint8_t flag; +#ifdef __APPLE__ +#define uint16 qemu_uint16 +#endif typedef uint8_t uint8; typedef int8_t int8; #ifndef _AIX