OSDN Git Service

Merge commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Dec 2013 22:57:23 +0000 (23:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Dec 2013 22:57:29 +0000 (23:57 +0100)
* commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f':
  build: Define __printf__ to __gnu_printf__ on MinGW*/gcc

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

diff --cc configure
+++ b/configure
@@@ -3850,11 -3416,9 +3851,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
 +        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"
 +        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