mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
configure: Only redefine inline to __inline for msvc if necessary
This isn't necessary on MSVC 2015 any longer. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
0cff125200
commit
5fd553d312
13
configure
vendored
13
configure
vendored
@ -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 -Dinline=__inline -Dstrtoll=_strtoi64'
|
||||
_cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -Dstrtoll=_strtoi64'
|
||||
elif $_cc 2>&1 | grep -q Intel; then
|
||||
_type=icl
|
||||
_ident=$($_cc 2>&1 | head -n1)
|
||||
@ -4691,6 +4691,17 @@ EOF
|
||||
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
|
||||
clang)
|
||||
add_asflags -Qunused-arguments
|
||||
|
Loading…
Reference in New Issue
Block a user