aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-07-25 22:47:47 +0300
committerMartin Storsjö <martin@martin.st>2015-07-26 20:33:01 +0300
commit5fd553d31272d5ed42a7a5a0ecaab7b3452da83a (patch)
treea05e6b373b5c630a530b9ce6bbb9e029210358d3
parent0cff125200ab53fa3ae70d85b4f614f269fe3426 (diff)
downloadffmpeg-5fd553d31272d5ed42a7a5a0ecaab7b3452da83a.tar.gz
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>
-rwxr-xr-xconfigure13
1 files changed, 12 insertions, 1 deletions
diff --git a/configure b/configure
index ae6ad17c5d..f97104a874 100755
--- a/configure
+++ b/configure
@@ -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