Skip to content

F
ffmpeg
Commit 4d93e758 authored by Matt Oliver's avatar Matt Oliver Committed by Michael Niedermayer
Browse files
Options

configure: Ensure log2 is disable based on msvcrt version. 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 3b2ab8a7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
configure
View file @ 4d93e758
...@@ -4124,9 +4124,6 @@ case $libc_type in ...@@ -4124,9 +4124,6 @@ case $libc_type in
add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \ add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \
_snprintf=avpriv_snprintf \ _snprintf=avpriv_snprintf \
vsnprintf=avpriv_vsnprintf vsnprintf=avpriv_vsnprintf
# MSVC 2010 x64 requires log2 fix. However 2013 onwards is supported.
check_cpp_condition stdlib.h "_MSC_VER >= 1800" ||
disable log2
;; ;;
esac esac
...@@ -5021,6 +5018,8 @@ elif enabled_any msvc icl; then ...@@ -5021,6 +5018,8 @@ elif enabled_any msvc icl; then
disable ebx_available disable ebx_available
fi fi
fi fi
# msvcrt10 x64 incorrectly enables log2, only msvcrt12 onwards actually has log2.
check_cpp_condition crtversion.h "_VC_CRT_MAJOR_VERSION >= 12" || disable log2
fi fi
case $as_type in case $as_type in
......
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