[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/4] softfloat: Avoid uint16 type conflict on Dar
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v3 2/4] softfloat: Avoid uint16 type conflict on Darwin |
Date: |
Tue, 1 Nov 2011 18:59:36 +0100 |
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/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/Headers/NSURLError.h:17,
from
/System/Library/Frameworks/Foundation.framework/Headers/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
‘uint16’
/System/Library/Frameworks/Security.framework/Headers/cssmconfig.h:73: error:
previous declaration of ‘uint16’ was here
make: *** [ui/cocoa.o] Error 1
Apple's FSEvents.h has #include <Block.h>, 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ärber <address@hidden>
Cc: Eric Sunshine <address@hidden>
Cc: Juan Pineda <address@hidden>
Cc: Peter Maydell <address@hidden>
---
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;
--
1.7.0.3
Re: [Qemu-devel] [PATCH v2 2/4] softfloat: Avoid uint16 type conflict on Darwin, Eric Sunshine, 2011/11/01