Merge commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da'

* commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da': configure: Allow log2 with MSVC 2013 onwards. Conflicts: configure See: 4d93e758d7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 40964e2e89
parent 02b5af7744 3edeb7749e
commit 40964e2e89
1 changed files with 1 additions and 2 deletions
--- a/3
+++ b/3
@ -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