]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '46e3936fb04d06550151e667357065e3f646da1a'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 17:21:56 +0000 (18:21 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 17:21:56 +0000 (18:21 +0100)
* commit '46e3936fb04d06550151e667357065e3f646da1a':
  configure: Set __MSVCRT_VERSION__to 0x0700 for MinGW

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
configure

diff --cc configure
index 48a53f144b5224a4c160cbe9f2a303283e7e8616,e7bf5371f33cc977e559c9f4f8f98d1b76cbbf63..967f3d622c4fbdfa9397265d1cb4bb2d1fffaf43
+++ b/configure
@@@ -5053,8 -4003,8 +5053,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
          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