From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLIck-0007P3-2Y for qemu-devel@nongnu.org; Tue, 01 Nov 2011 13:59:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RLIci-0001Ry-AS for qemu-devel@nongnu.org; Tue, 01 Nov 2011 13:59:46 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:36090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLIch-0001RR-Oz for qemu-devel@nongnu.org; Tue, 01 Nov 2011 13:59:44 -0400 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate02.web.de (Postfix) with ESMTP id 323051B9D1F6D for ; Tue, 1 Nov 2011 18:59:42 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 1 Nov 2011 18:59:36 +0100 Message-Id: <1320170376-21605-1-git-send-email-andreas.faerber@web.de> In-Reply-To: <4EB0202E.50701@web.de> References: <4EB0202E.50701@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 2/4] softfloat: Avoid uint16 type conflict on Darwin List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Juan Pineda , Eric Sunshine On Mac OS X we get: 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/F= rameworks/CarbonCore.framework/Headers/FSEvents.h:28, from /System/Library/Frameworks/CoreServices.framework/F= rameworks/CarbonCore.framework/Headers/CarbonCore.h:218, from /System/Library/Frameworks/CoreServices.framework/F= rameworks/AE.framework/Headers/AE.h:20, from /System/Library/Frameworks/CoreServices.framework/H= eaders/CoreServices.h:21, from /System/Library/Frameworks/Foundation.framework/Hea= ders/NSURLError.h:17, from /System/Library/Frameworks/Foundation.framework/Hea= ders/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= =E2=80=98uint16=E2=80=99 /System/Library/Frameworks/Security.framework/Headers/cssmconfig.h:73: er= ror: previous declaration of =E2=80=98uint16=E2=80=99 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 reusing uint16 from Security/cssmconfig.h on Darwin. This fixes the build until we have a more general solution. Signed-off-by: Andreas F=C3=A4rber Cc: Eric Sunshine Cc: Juan Pineda Cc: Peter Maydell --- fpu/softfloat.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fpu/softfloat.h b/fpu/softfloat.h index 07c2929..229d834 100644 --- a/fpu/softfloat.h +++ b/fpu/softfloat.h @@ -57,7 +57,9 @@ typedef uint8_t flag; typedef uint8_t uint8; typedef int8_t int8; #ifndef _AIX +#if !(defined(__APPLE__) && defined(_UINT16)) typedef int uint16; +#endif typedef int int16; #endif typedef unsigned int uint32; --=20 1.7.0.3