From a3946b895633bf0421685af9a52df4a52ad10d30 Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 10 Dec 2014 12:56:38 -0800 Subject: [PATCH] enc_neon: fix building with non-Xcode clang (iOS) check for __apple_build_version__ to distinguish the two; a version check could work as Apple bumped Xcode's to 5.x/6.x, but it's unclear how upstream will deal with their versioning as they go 3.6+, so avoid it for now. Change-Id: I67cda67c4f68e262a92d805a63cc1496374be063 --- src/dsp/enc_neon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dsp/enc_neon.c b/src/dsp/enc_neon.c index 68e49455..1b912f0f 100644 --- a/src/dsp/enc_neon.c +++ b/src/dsp/enc_neon.c @@ -857,7 +857,8 @@ static int QuantizeBlock(int16_t in[16], int16_t out[16], const int16x8_t out1 = Quantize(in, mtx, 8); uint8x8x4_t shuffles; // vtbl4_u8 is marked unavailable for iOS arm64, use wider versions there. -#if defined(__APPLE__) && defined(__aarch64__) +#if defined(__APPLE__) && defined(__aarch64__) && \ + defined(__apple_build_version__) uint8x16x2_t all_out; INIT_VECTOR2(all_out, vreinterpretq_u8_s16(out0), vreinterpretq_u8_s16(out1)); INIT_VECTOR4(shuffles,