From: Jun Tian Date: Thu, 14 Jun 2012 06:42:58 +0000 (+0800) Subject: [Title] Fix conflicting types for uint16 on Mac X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1528^2~76 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a9190ee2977a58d83820a155d188c566905d1870;p=sdk%2Femulator%2Fqemu.git [Title] Fix conflicting types for uint16 on Mac [Type] [Module] Emulator [Priority] normal [Jira#] [Redmine#] [Problem] [Cause] [Solution] It's an upstream bug on Mac. It resolved by defining _UINT16, then int16_t will be defined in other header file. [TestCase] --- diff --git a/fpu/softfloat.h b/fpu/softfloat.h index 063d3dd618..937d7fa949 100644 --- a/fpu/softfloat.h +++ b/fpu/softfloat.h @@ -57,7 +57,10 @@ typedef uint8_t flag; typedef uint8_t uint8; typedef int8_t int8; #ifndef _AIX +#if !(defined(__APPLE__) && defined(_UINT16)) typedef int16_t uint16; +#define _UINT16 +#endif typedef int int16; #endif typedef unsigned int uint32;