From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLIvF-0001br-3W for qemu-devel@nongnu.org; Tue, 01 Nov 2011 14:18:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RLIvD-0006MP-MD for qemu-devel@nongnu.org; Tue, 01 Nov 2011 14:18:53 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:51862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLIvD-0006MD-9I for qemu-devel@nongnu.org; Tue, 01 Nov 2011 14:18:51 -0400 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate02.web.de (Postfix) with ESMTP id 0D5C31B9D56A5 for ; Tue, 1 Nov 2011 19:18:50 +0100 (CET) Message-ID: <4EB037C2.4080002@web.de> Date: Tue, 01 Nov 2011 19:17:38 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <4EB0202E.50701@web.de> <1320170376-21605-1-git-send-email-andreas.faerber@web.de> In-Reply-To: <1320170376-21605-1-git-send-email-andreas.faerber@web.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [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 , Juan Pineda , Eric Sunshine Am 01.11.2011 18:59, schrieb Andreas F=C3=A4rber: > On Mac OS X we get: >=20 > 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/H= eaders/NSURLError.h:17, > from /System/Library/Frameworks/Foundation.framework/H= eaders/Foundation.h:81, > from /System/Library/Frameworks/Cocoa.framework/Header= s/Cocoa.h:12, > from ui/cocoa.m:25: > /Users/andreas/QEMU/qemu/fpu/softfloat.h:60: error: conflicting types f= or =E2=80=98uint16=E2=80=99 > /System/Library/Frameworks/Security.framework/Headers/cssmconfig.h:73: = error: previous declaration of =E2=80=98uint16=E2=80=99 was here > make: *** [ui/cocoa.o] Error 1 >=20 > 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. >=20 > 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. >=20 > Signed-off-by: Andreas F=C3=A4rber > Cc: Eric Sunshine > Cc: Juan Pineda > Cc: Peter Maydell v3 series is available from git://repo.or.cz/qemu/afaerber.git cocoa-for-upstream If no further protest arises, I'll send a pull request later today. Andreas > --- > fpu/softfloat.h | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) >=20 > 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;