[FFmpeg-cvslog] configure: Move MinGW64 specific check to the correct place

James Almer git at videolan.org
Mon Dec 9 02:18:13 CET 2013


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Dec  8 16:13:07 2013 -0300| [0cde2ae3f1143547ebce0134fcaa559b8629de88] | committer: Michael Niedermayer

configure: Move MinGW64 specific check to the correct place

It was misplaced during merge of commit 120797e2ef0ca317daf63ad79be5f72f835e9ac2

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 configure |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index dd89764..ed22954 100755
--- a/configure
+++ b/configure
@@ -3824,6 +3824,12 @@ elif check_cpp_condition newlib.h "defined _NEWLIB_VERSION"; then
 # MinGW64 is backwards compatible with MinGW32, so check for it first.
 elif check_cpp_condition _mingw.h "defined __MINGW64_VERSION_MAJOR"; then
     libc_type=mingw64
+    if check_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_cppflags -D__USE_MINGW_ANSI_STDIO=1
+    fi
     add_cppflags -U__STRICT_ANSI__
 elif check_cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
     libc_type=mingw32
@@ -3831,13 +3837,6 @@ elif check_cpp_condition _mingw.h "defined __MINGW32_VERSION"; then
         (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)" ||
         die "ERROR: MinGW32 runtime version must be >= 3.15."
     add_cppflags -U__STRICT_ANSI__
-    if check_cpp_condition _mingw.h "defined(__MINGW64_VERSION_MAJOR) && \
-            __MINGW64_VERSION_MAJOR < 3"; then
-        add_compat msvcrt/snprintf.o
-        add_cflags "-include $source_path/compat/msvcrt/snprintf.h"
-    else
-        add_cppflags -D__USE_MINGW_ANSI_STDIO=1
-    fi
 elif check_cpp_condition crtversion.h "defined _VC_CRT_MAJOR_VERSION"; then
     libc_type=msvcrt
     add_compat strtod.o strtod=avpriv_strtod



More information about the ffmpeg-cvslog mailing list