Commit 40964e2e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3edeb774'

* commit '3edeb774':
  configure: Allow log2 with MSVC 2013 onwards.

Conflicts:
	configure

See: 4d93e758Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 02b5af77 3edeb774
......@@ -2073,7 +2073,6 @@ fast_unaligned_if_any="aarch64 ppc x86"
simd_align_16_if_any="altivec neon sse"
# system capabilities
symver_if_any="symver_asm_label symver_gnu_asm"
valgrind_backtrace_deps="!optimizations valgrind_valgrind_h"
......@@ -5508,7 +5507,7 @@ elif enabled_any msvc icl; then
disable ebx_available
fi
fi
# msvcrt10 x64 incorrectly enables log2, only msvcrt12 onwards actually has log2.
# msvcrt10 x64 incorrectly enables log2, only msvcrt12 (MSVC 2013) onwards actually has log2.
check_cpp_condition crtversion.h "_VC_CRT_MAJOR_VERSION >= 12" || disable log2
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment