diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-16 23:57:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-16 23:57:29 +0100 |
| commit | a67387913eb0c19f2dac4f1e085e5429d2074d6f (patch) | |
| tree | 733806061565fb8f44f0b64e7b60c390d43debce | |
| parent | a788949255d5fde243575b556e2950feafdc6755 (diff) | |
| parent | 11bb5e10c36539bcc303ceaac6f88d9ecb66e07f (diff) | |
| download | ffmpeg-a67387913eb0c19f2dac4f1e085e5429d2074d6f.tar.gz | |
Merge commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f'
* commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f':
build: Define __printf__ to __gnu_printf__ on MinGW*/gcc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -3836,6 +3836,7 @@ esac probe_libc(){ pfx=$1 + pfx_no_=${pfx%_} # uclibc defines __GLIBC__, so it needs to be checked before glibc. if check_${pfx}cpp_condition features.h "defined __UCLIBC__"; then eval ${pfx}libc_type=uclibc @@ -3855,6 +3856,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 + eval test \$${pfx_no_}cc_type = "gcc" && + add_${pfx}cppflags -D__printf__=__gnu_printf__ 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 @@ -3862,6 +3865,8 @@ probe_libc(){ (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" || die "ERROR: MinGW32 runtime version must be >= 3.15." add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1 + eval test \$${pfx_no_}cc_type = "gcc" && + add_${pfx}cppflags -D__printf__=__gnu_printf__ elif check_${pfx}cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then eval ${pfx}libc_type=msvcrt # The MSVC 2010 headers (Win 7.0 SDK) set _WIN32_WINNT to |