Commit 342b0ba5 authored by Martin Storsjö's avatar Martin Storsjö

configure: Only redirect strtoll to _strtoi64 if necessary

This isn't necessary any longer on MSVC 2013 Update 4.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 5fd553d3
...@@ -3057,7 +3057,7 @@ probe_cc(){ ...@@ -3057,7 +3057,7 @@ probe_cc(){
_ld_lib='lib%.a' _ld_lib='lib%.a'
_ld_path='-libpath:' _ld_path='-libpath:'
_flags='-nologo' _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 elif $_cc 2>&1 | grep -q Intel; then
_type=icl _type=icl
_ident=$($_cc 2>&1 | head -n1) _ident=$($_cc 2>&1 | head -n1)
...@@ -3080,7 +3080,7 @@ probe_cc(){ ...@@ -3080,7 +3080,7 @@ probe_cc(){
_flags='-nologo -Qdiag-error:4044,10157' _flags='-nologo -Qdiag-error:4044,10157'
# -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
# with MSVC which enables it by default. # 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 elif $_cc --version 2>/dev/null | grep -q ^cparser; then
_type=cparser _type=cparser
_ident=$($_cc --version | head -n1) _ident=$($_cc --version | head -n1)
...@@ -4689,6 +4689,7 @@ elif enabled_any msvc icl; then ...@@ -4689,6 +4689,7 @@ elif enabled_any msvc icl; then
__declspec($_restrict) void* foo(int); __declspec($_restrict) void* foo(int);
EOF EOF
fi fi
check_func strtoll || add_cflags -Dstrtoll=_strtoi64
fi fi
for pfx in "" host_; do for pfx in "" host_; do
......
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