ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Sat Jul 25 22:47:47 2015 +0300| [5fd553d31272d5ed42a7a5a0ecaab7b3452da83a] | committer: Martin Storsjö
configure: Only redefine inline to __inline for msvc if necessary This isn't necessary on MSVC 2015 any longer. Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fd553d31272d5ed42a7a5a0ecaab7b3452da83a --- configure | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ae6ad17..f97104a 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog