From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:33375)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andreas.faerber@web.de>) id 1RKyJs-0002m2-CQ
	for qemu-devel@nongnu.org; Mon, 31 Oct 2011 16:18:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <andreas.faerber@web.de>) id 1RKyJq-0000YX-U7
	for qemu-devel@nongnu.org; Mon, 31 Oct 2011 16:18:56 -0400
Received: from fmmailgate02.web.de ([217.72.192.227]:60039)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andreas.faerber@web.de>) id 1RKyJq-0000YM-LE
	for qemu-devel@nongnu.org; Mon, 31 Oct 2011 16:18:54 -0400
Received: from moweb002.kundenserver.de (moweb002.kundenserver.de
	[172.19.20.108])
	by fmmailgate02.web.de (Postfix) with ESMTP id 6988D1B9D9F2A
	for <qemu-devel@nongnu.org>; Mon, 31 Oct 2011 21:18:53 +0100 (CET)
Message-ID: <4EAEF466.8050105@web.de>
Date: Mon, 31 Oct 2011 20:17:58 +0100
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <andreas.faerber@web.de>
MIME-Version: 1.0
References: <1320088682-12958-1-git-send-email-andreas.faerber@web.de>
	<1320088682-12958-3-git-send-email-andreas.faerber@web.de>
	<CAFEAcA_F6D7+piuuH3=GqM_6C345+e__wRKPufevEHbJnVah+Q@mail.gmail.com>
In-Reply-To: <CAFEAcA_F6D7+piuuH3=GqM_6C345+e__wRKPufevEHbJnVah+Q@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v2 2/4] softfloat: Avoid uint16 type
	conflict on Darwin
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Juan Pineda <juan@logician.com>, qemu-devel@nongnu.org

Am 31.10.2011 20:42, schrieb Peter Maydell:
> On 31 October 2011 19:18, Andreas F=C3=A4rber <andreas.faerber@web.de> =
wrote:
>> --- a/fpu/softfloat.h
>> +++ b/fpu/softfloat.h
>> @@ -54,6 +54,9 @@ these four paragraphs for those parts of this code t=
hat 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
> I hate this, but I don't think I quite hate it enough to leave compilat=
ion
> on Macs broken in 1.0...
>=20
> Ideally we should just make a decision about whether we want option
> (1) or (2) from
> http://permalink.gmane.org/gmane.comp.emulators.qemu/115848

That's what "more general solution" refers to.

At this point in time though I'd much prefer to commit a non-intrusive
three-line quickfix (which we can easily remove later on) than no
solution at all or than to refactor lots of softfloat code.

Andreas