diff options
| -rw-r--r-- | arch_init.c | 4 | ||||
| -rw-r--r-- | ui/cocoa.m | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch_init.c b/arch_init.c index 988adcae07..a9e8b7442b 100644 --- a/arch_init.c +++ b/arch_init.c @@ -100,6 +100,10 @@ const uint32_t arch_type = QEMU_ARCH; #define VECTYPE vector unsigned char #define SPLAT(p) vec_splat(vec_ld(0, p), 0) #define ALL_EQ(v1, v2) vec_all_eq(v1, v2) +/* altivec.h may redefine the bool macro as vector type. + * Reset it to POSIX semantics. */ +#undef bool +#define bool _Bool #elif defined __SSE2__ #include <emmintrin.h> #define VECTYPE __m128i diff --git a/ui/cocoa.m b/ui/cocoa.m index e7d6e898ee..2383646dc0 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -879,7 +879,8 @@ int main (int argc, const char * argv[]) { !strcmp(opt, "-vnc") || !strcmp(opt, "-nographic") || !strcmp(opt, "-version") || - !strcmp(opt, "-curses")) { + !strcmp(opt, "-curses") || + !strcmp(opt, "-qtest")) { return qemu_main(gArgc, gArgv, *_NSGetEnviron()); } } |