diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-04 22:05:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-04 22:07:37 +0100 |
| commit | 8dd4f5ecf95b873d8fe27ed8d9f7bd5be6cc0982 (patch) | |
| tree | f47aed2a07462ae9144083af796fa13545915ce9 /configure | |
| parent | 517ec808595dd1fdf4c8e7b45022a7029d36a1b3 (diff) | |
| parent | bd8b6185f6d1fb0433f048c4096b858e6f88ded6 (diff) | |
| download | ffmpeg-8dd4f5ecf95b873d8fe27ed8d9f7bd5be6cc0982.tar.gz | |
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>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 \ |