Commit 8593e050 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Anthony Liguori
Browse files

qemu-common: Resolve vector build breakes for AltiVec 



On Mac OS X ppc, altivec.h defines "vector", leading to build breakage
when used as variable name, e.g. in tracing code.
Fix this by undefining identifiers after altivec.h inclusion.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAndreas Färber <andreas.faerber@web.de>
Message-id: 1368632771-4328-1-git-send-email-andreas.faerber@web.de
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 262f27b9

include/qemu-common.h

+8 −2
Original line number Diff line number Diff line
@@ -448,12 +448,18 @@ void hexdump(const char *buf, FILE *fp, const char *prefix, size_t size); 
/* vector definitions */

#ifdef __ALTIVEC__

#include <altivec.h>

#define VECTYPE        vector unsigned char

/* The altivec.h header says we're allowed to undef these for

 * C++ compatibility.  Here we don't care about C++, but we

 * undef them anyway to avoid namespace pollution.

 */

#undef vector

#undef pixel

#undef bool

#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>