Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 21:51:44 +0000 (22:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 21:52:28 +0000 (22:52 +0100)
* commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -3850,13 -3415,7 +3850,13 @@@ probe_libc()
      # MinGW64 is backwards compatible with MinGW32, so check for it first.
      elif check_${pfx}cpp_condition _mingw.h "defined __MINGW64_VERSION_MAJOR"; then
          eval ${pfx}libc_type=mingw64
-         add_${pfx}cppflags -U__STRICT_ANSI__
 +        if check_${pfx}cpp_condition _mingw.h "__MINGW64_VERSION_MAJOR < 3"; then
 +            add_compat msvcrt/snprintf.o
 +            add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
 +        else
 +            add_${pfx}cppflags -D__USE_MINGW_ANSI_STDIO=1
 +        fi
+         add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1
      elif 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 || \