aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-01 13:44:39 -0300
committerJames Almer <jamrial@gmail.com>2017-11-01 13:47:02 -0300
commit9c2f4771510648cda601c4680cb91092eaae3f9a (patch)
treec4648b1f978d1823029f096cba9d72fee5814bac
parent7c9b469a6b24c59a91dd147928fd599a108de232 (diff)
parent4d444d04c1e19cd02ac836d411433906a9f32613 (diff)
downloadffmpeg-9c2f4771510648cda601c4680cb91092eaae3f9a.tar.gz
Merge commit '4d444d04c1e19cd02ac836d411433906a9f32613'
* commit '4d444d04c1e19cd02ac836d411433906a9f32613': configure: Default to _WIN32_WINNT=0x0502 (XP) as minimum, for legacy mingw See 69f7aad5710f280ad854ea0bb84d59ed1b55bf5b Merged-by: James Almer <jamrial@gmail.com>
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index ef9edc9010..63ee46a53b 100755
--- a/configure
+++ b/configure
@@ -5248,10 +5248,10 @@ 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
- check_${pfx}cpp_condition _mingw.h "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0502" ||
- add_${pfx}cppflags -D_WIN32_WINNT=0x0502
check_${pfx}cpp_condition _mingw.h "__MSVCRT_VERSION__ < 0x0700" &&
add_${pfx}cppflags -D__MSVCRT_VERSION__=0x0700
+ check_${pfx}cpp_condition windows.h "defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0502" &&
+ add_${pfx}cppflags -D_WIN32_WINNT=0x0502
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