Merge commit 'bdc111a1'

* commit 'bdc111a1': configure: Detect newer (>=4.1) versions of MinGW32 Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'bdc111a1'
* commit 'bdc111a1': configure: Detect newer (>=4.1) versions of MinGW32 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2a459f5d · Michael Niedermayer · 7b2a19cb · bdc111a1 · 2a459f5d
Commit 2a459f5d authored Dec 13, 2013 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

configure configure +2 -1

No files found.
--- a/configure
+++ b/configure
@@ -3855,7 +3855,8 @@ probe_libc(){
            add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
        fi
        add_${pfx}cppflags -U__STRICT_ANSI__ -D__USE_MINGW_ANSI_STDIO=1
-    elif check_${pfx}cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
+    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
        check_${pfx}cpp_condition _mingw.h "__MINGW32_MAJOR_VERSION > 3 || \
            (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||