[FFmpeg-cvslog] Merge commit '56af0bc10f49654b5b5f3efe82c69a13bf15fc8b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Wed Mar 15 12:39:34 2017 +0100| [132523448ba495f392706b0d1e0625e6e8555d13] | committer: Clément Bœsch

Merge commit '56af0bc10f49654b5b5f3efe82c69a13bf15fc8b'

* commit '56af0bc10f49654b5b5f3efe82c69a13bf15fc8b':
  configure: Check for strtoll and redirect to _strtoi64 in the msvcrt block

Also includes _strtoui64 in the check.

Merged-by: Clément Bœsch <cboesch at gopro.com>

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

 configure | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 1e2e774..a91ab07 100755
--- a/configure
+++ b/configure
@@ -5055,6 +5055,10 @@ probe_libc(){
 #endif
 #endif
 EOF
+        if [ "$pfx" = "" ]; then
+            check_func strtoll || add_cflags -Dstrtoll=_strtoi64
+            check_func strtoull || add_cflags -Dstrtoull=_strtoui64
+        fi
     elif check_${pfx}cpp_condition stddef.h "defined __KLIBC__"; then
         eval ${pfx}libc_type=klibc
     elif check_${pfx}cpp_condition sys/cdefs.h "defined __BIONIC__"; then
@@ -6330,8 +6334,6 @@ elif enabled_any msvc icl; then
 __declspec($_restrict) void* foo(int);
 EOF
     fi
-    check_func strtoll || add_cflags -Dstrtoll=_strtoi64
-    check_func strtoull || add_cflags -Dstrtoull=_strtoui64
     # the new SSA optimzer in VS2015 U3 is mis-optimizing some parts of the code
     # Issue has been fixed in MSVC v19.00.24218.
     check_cpp_condition windows.h "_MSC_FULL_VER >= 190024218" ||


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

diff --cc configure
index 1e2e774,6f5daef..a91ab07
--- a/configure
+++ b/configure
@@@ -5055,6 -4008,9 +5055,10 @@@ probe_libc()
  #endif
  #endif
  EOF
+         if [ "$pfx" = "" ]; then
+             check_func strtoll || add_cflags -Dstrtoll=_strtoi64
++            check_func strtoull || add_cflags -Dstrtoull=_strtoui64
+         fi
      elif check_${pfx}cpp_condition stddef.h "defined __KLIBC__"; then
          eval ${pfx}libc_type=klibc
      elif check_${pfx}cpp_condition sys/cdefs.h "defined __BIONIC__"; then
@@@ -6330,15 -4982,6 +6334,13 @@@ elif enabled_any msvc icl; the
  __declspec($_restrict) void* foo(int);
  EOF
      fi
-     check_func strtoll || add_cflags -Dstrtoll=_strtoi64
-     check_func strtoull || add_cflags -Dstrtoull=_strtoui64
 +    # the new SSA optimzer in VS2015 U3 is mis-optimizing some parts of the code
 +    # Issue has been fixed in MSVC v19.00.24218.
 +    check_cpp_condition windows.h "_MSC_FULL_VER >= 190024218" ||
 +        check_cflags -d2SSAOptimizer-
 +    # enable utf-8 source processing on VS2015 U2 and newer
 +    check_cpp_condition windows.h "_MSC_FULL_VER >= 190023918" &&
 +        add_cflags -utf-8
  fi
  
  for pfx in "" host_; do