On Mon, 8 Jun 2015, Luca Barbato wrote:

On 08/06/15 09:20, Martin Storsjö wrote:
On Sun, 7 Jun 2015, Luca Barbato wrote:

The C runtime C99 compatibility had been improved a lot and it now
rejects some of the compatibility defines provided for the older
versions.

Many thanks to Ray for the time spent testing.

Bug-Id: 864
CC: libav-sta...@libav.org
---

Martin does it sound ok for you?

Almost


configure            | 22 ++++++++++------------
libavutil/internal.h | 11 ++++++-----
2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 18f0518..c8a799d 100755
--- a/configure
+++ b/configure
@@ -3021,9 +3021,6 @@ probe_cc(){
        _ld_path='-libpath:'
        _flags='-nologo'
        _cflags='-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS
-Dinline=__inline -FIstdlib.h -Dstrtoll=_strtoi64'
-        if [ $pfx = hostcc ]; then
-            append _cflags -Dsnprintf=_snprintf
-        fi
    elif $_cc 2>&1 | grep -q Intel; then
        _type=icl
        _ident=$($_cc 2>&1 | head -n1)
@@ -3047,9 +3044,6 @@ probe_cc(){
        # -Qvec- -Qsimd- to prevent miscompilation, -GS for consistency
        # with MSVC which enables it by default.
        _cflags='-D_USE_MATH_DEFINES -FIstdlib.h -Dstrtoll=_strtoi64
-Qms0 -Qvec- -Qsimd- -GS'
-        if [ $pfx = hostcc ]; then
-            append _cflags -Dsnprintf=_snprintf
-        fi
    elif $_cc --version 2>/dev/null | grep -q ^cparser; then
        _type=cparser
        _ident=$($_cc --version | head -n1)
@@ -3743,6 +3737,16 @@ probe_libc(){
            add_${pfx}cppflags -D__printf__=__gnu_printf__
    elif check_${pfx}cpp_condition crtversion.h "defined
_VC_CRT_MAJOR_VERSION"; then
        eval ${pfx}libc_type=msvcrt
+        if check_${pfx}cpp_condition crtversion.h
"_VC_CRT_MAJOR_VERSION < 14"; then
+            if [ $pfx = host_ ]; then

You want to have quotes around $pfx here, since it will be empty once;
this avoids warnings like this:

configure: 3741: [: =: unexpected operator

Other than that, this looks good. I had a similar patch locally that I
wrote originally when the first preview of MSVC 2014 (as it was called
back then) was made available a year ago, that I hadn't sent yet -
originally since things were so much in flux (I think they've
restructured the CRT a couple of times since that, although the fixes to
our build system were the same). The 2015 version still isn't officially
released, but it is getting closer though.

At least a couple of users are having the problem so I'd fix the quoting
and push it.

Yes, I think it is converging towards a release pretty soon; it does feel pretty ready by now.

// Martin
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to