aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMatt Oliver <protogonoi@gmail.com>2014-05-12 17:35:52 +1000
committerMichael Niedermayer <michaelni@gmx.at>2014-05-12 10:08:15 +0200
commit4d93e758d732726fa7e20693db1f447985f1d6d8 (patch)
treeaa68b244c5344960c19704c8541a9d631117d6ff /configure
parent3b2ab8a78306633db75bba2522a56cd4d5dfb458 (diff)
downloadffmpeg-4d93e758d732726fa7e20693db1f447985f1d6d8.tar.gz
configure: Ensure log2 is disable based on msvcrt version.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure b/configure
index a1176645a2..415b4ad583 100755
--- a/configure
+++ b/configure
@@ -4124,9 +4124,6 @@ case $libc_type in
add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \
_snprintf=avpriv_snprintf \
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
@@ -5021,6 +5018,8 @@ elif enabled_any msvc icl; then
disable ebx_available
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
case $as_type in