RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  configure: Detect msvcrt libc with a CPP check instead of a link check

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-04 22:05:11 +01:00
parent 517ec80859 bd8b6185f6
commit 8dd4f5ecf9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -3809,7 +3809,7 @@ elif check_header _mingw.h; then
else
add_cppflags -D__USE_MINGW_ANSI_STDIO=1
fi
elif check_func_headers stdlib.h _get_doserrno; then
elif check_cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then
libc_type=msvcrt
add_compat strtod.o strtod=avpriv_strtod
add_compat msvcrt/snprintf.o snprintf=avpriv_snprintf \