diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 20:49:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 20:49:22 +0100 |
| commit | 2a459f5d87f804204ef5191de503672a3ddcf820 (patch) | |
| tree | e7476eb8948b86079dc405848450d5732ce5575a | |
| parent | 7b2a19cb9e6605d7c886896c458986e2a7cab40e (diff) | |
| parent | bdc111a162094c14660d1e88839d103a4d79e42a (diff) | |
| download | ffmpeg-2a459f5d87f804204ef5191de503672a3ddcf820.tar.gz | |
Merge commit 'bdc111a162094c14660d1e88839d103a4d79e42a'
* commit 'bdc111a162094c14660d1e88839d103a4d79e42a':
configure: Detect newer (>=4.1) versions of MinGW32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3855,7 +3855,8 @@ probe_libc(){ add_cflags "-include $source_path/compat/msvcrt/snprintf.h" fi add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1 - elif check_${pfx}cpp_condition _mingw.h "defined __MINGW32_VERSION"; then + elif check_${pfx}cpp_condition _mingw.h "defined __MINGW_VERSION" || + check_${pfx}cpp_condition _mingw.h "defined __MINGW32_VERSION"; then eval ${pfx}libc_type=mingw32 check_${pfx}cpp_condition _mingw.h "__MINGW32_MAJOR_VERSION > 3 || \ (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" || |