Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'

* commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a':
  configure: Only redefine inline to __inline for msvc if necessary

Conflicts:
	configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

configure

@@ -3680,7 +3680,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'
         disable stripping
     elif $_cc --version 2>/dev/null | grep -q ^cparser; then
         _type=cparser
@@ -5683,6 +5683,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