Commit 5fd553d3 authored by Martin Storsjö's avatar Martin Storsjö

configure: Only redefine inline to __inline for msvc if necessary

This isn't necessary on MSVC 2015 any longer.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 0cff1252
...@@ -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 -Dinline=__inline -Dstrtoll=_strtoi64' _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dstrtoll=_strtoi64'
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)
...@@ -4691,6 +4691,17 @@ EOF ...@@ -4691,6 +4691,17 @@ EOF
fi fi
fi fi
for pfx in "" host_; do
pfx_no_=${pfx%_}
varname=${pfx_no_}cc_type
eval "type=\$$varname"
if [ $type = "msvc" ]; then
check_${pfx}cc <<EOF || add_${pfx}cflags -Dinline=__inline
static inline int foo(int a) { return a; }
EOF
fi
done
case $as_type in case $as_type in
clang) clang)
add_asflags -Qunused-arguments add_asflags -Qunused-arguments
......
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