diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-03 01:29:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-03 01:30:53 +0200 |
| commit | 40964e2e894f057f0afad575e48f87d1153d2914 (patch) | |
| tree | ef8ef1410313c76cd0784240aabd411812c63c3e /configure | |
| parent | 02b5af7744059aecd580e5d7be60964695bd5a75 (diff) | |
| parent | 3edeb7749e4276c78ad57307b8c3b32dd476d1da (diff) | |
Merge commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da'
* commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da':
configure: Allow log2 with MSVC 2013 onwards.
Conflicts:
configure
See: 4d93e758d732726fa7e20693db1f447985f1d6d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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 |