diff options
| author | Johann Koenig <johannkoenig@google.com> | 2016-07-25 19:44:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-25 19:44:05 +0000 |
| commit | 5c0f5cdda8b2700d05dcf4b3b9df0b6cd637e89c (patch) | |
| tree | beba99c8379caaf1f436352469d86d7b3012ecbd | |
| parent | 7aa0c748b34a242ceb3609b0638674a1fe396931 (diff) | |
| parent | 91369fd9b7be7ccbc22b3b296a7ea601fb59f8d7 (diff) | |
| download | libvpx-5c0f5cdda8b2700d05dcf4b3b9df0b6cd637e89c.tar libvpx-5c0f5cdda8b2700d05dcf4b3b9df0b6cd637e89c.tar.gz libvpx-5c0f5cdda8b2700d05dcf4b3b9df0b6cd637e89c.tar.bz2 libvpx-5c0f5cdda8b2700d05dcf4b3b9df0b6cd637e89c.zip | |
Merge "Fix compilation error under Clang 4.0."
| -rw-r--r-- | vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c b/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c index cbd22dcd0..01cf4354a 100644 --- a/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c +++ b/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c @@ -37,7 +37,7 @@ DECLARE_ALIGNED(32, static const uint8_t, filt4_global_avx2[32]) = { #if defined(__clang__) # if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 3) || \ - (defined(__APPLE__) && \ + (defined(__APPLE__) && defined(__apple_build_version__) && \ ((__clang_major__ == 4 && __clang_minor__ <= 2) || \ (__clang_major__ == 5 && __clang_minor__ == 0))) |