From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKxO0-00057F-DA for qemu-devel@nongnu.org; Mon, 31 Oct 2011 15:19:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKxNz-0004Ig-4Q for qemu-devel@nongnu.org; Mon, 31 Oct 2011 15:19:08 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:44220) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKxNy-0004IY-Rg for qemu-devel@nongnu.org; Mon, 31 Oct 2011 15:19:07 -0400 Received: from moweb002.kundenserver.de (moweb002.kundenserver.de [172.19.20.108]) by fmmailgate02.web.de (Postfix) with ESMTP id 343751B9D9A86 for ; Mon, 31 Oct 2011 20:19:06 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 31 Oct 2011 20:18:00 +0100 Message-Id: <1320088682-12958-3-git-send-email-andreas.faerber@web.de> In-Reply-To: <1320088682-12958-1-git-send-email-andreas.faerber@web.de> References: <1320088682-12958-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 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 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 renaming specifically uint16 on Darwin to qemu_uint16. This fixes the build until we have a more general solution. Signed-off-by: Andreas F=C3=A4rber 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 --=20 1.7.0.3