diff options
author | Martin Storsjö <martin@martin.st> | 2015-07-25 22:54:26 +0300 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2015-07-26 20:33:09 +0300 |
commit | 342b0ba5f93b09b1d0c2597db44605300e6fcc53 (patch) | |
tree | b4802955b74383530dacb4935a2035ceffd7e9fb | |
parent | 5fd553d31272d5ed42a7a5a0ecaab7b3452da83a (diff) | |
download | ffmpeg-342b0ba5f93b09b1d0c2597db44605300e6fcc53.tar.gz |
configure: Only redirect strtoll to _strtoi64 if necessary
This isn't necessary any longer on MSVC 2013 Update 4.
Signed-off-by: Martin Storsjö <martin@martin.st>
-rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3057,7 +3057,7 @@ probe_cc(){ _ld_lib='lib%.a' _ld_path='-libpath:' _flags='-nologo' - _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dstrtoll=_strtoi64' + _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS' elif $_cc 2>&1 | grep -q Intel; then _type=icl _ident=$($_cc 2>&1 | head -n1) @@ -3080,7 +3080,7 @@ probe_cc(){ _flags='-nologo -Qdiag-error:4044,10157' # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency # with MSVC which enables it by default. - _cflags='-D_USE_MATH_DEFINES -Dstrtoll=_strtoi64 -Qms0 -Qvec- -Qsimd- -GS' + _cflags='-D_USE_MATH_DEFINES -Qms0 -Qvec- -Qsimd- -GS' elif $_cc --version 2>/dev/null | grep -q ^cparser; then _type=cparser _ident=$($_cc --version | head -n1) @@ -4689,6 +4689,7 @@ elif enabled_any msvc icl; then __declspec($_restrict) void* foo(int); EOF fi + check_func strtoll || add_cflags -Dstrtoll=_strtoi64 fi for pfx in "" host_; do |