[FFmpeg-cvslog] Merge commit '46e3936fb04d06550151e667357065e3f646da1a'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 18:21:56 2017 +0100| [206a9fb29cbc399d0f789af714d2371553fb0d65] | committer: Clément Bœsch

Merge commit '46e3936fb04d06550151e667357065e3f646da1a'

* commit '46e3936fb04d06550151e667357065e3f646da1a':
  configure: Set __MSVCRT_VERSION__to 0x0700 for MinGW

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=206a9fb29cbc399d0f789af714d2371553fb0d65
---

 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index 48a53f1..967f3d6 100755
--- a/configure
+++ b/configure
@@ -5055,6 +5055,8 @@ probe_libc(){
         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


======================================================================

diff --cc configure
index 48a53f1,e7bf537..967f3d6
--- a/configure
+++ 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