From 58ead8dd27681a8203ca94e3c83bdd00ec434f41 Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Mon, 7 Nov 2016 13:00:08 +0100 Subject: fixed appveyor.yml --- appveyor.yml | 10 +++++----- lib/lz4frame.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e941a7e..b51a7ad 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,13 +14,13 @@ environment: CONFIGURATION: "Release" PLATFORM: "Win32" - COMPILER: "gcc" - MAKE_PARAMS: "-C programs lz4 fullbench" + MAKE_PARAMS: "make -C programs lz4 && make -C tests fullbench" PLATFORM: "mingw64" - COMPILER: "gcc" - MAKE_PARAMS: "-C programs lz4 fullbench" + MAKE_PARAMS: "make -C programs lz4 && make -C tests fullbench" PLATFORM: "mingw32" - COMPILER: "gcc" - MAKE_PARAMS: '-C programs lz4 fullbench CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion"' + MAKE_PARAMS: 'make -C programs lz4 CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion" && make -C tests fullbench CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion"' PLATFORM: "clang" install: @@ -48,8 +48,8 @@ build_script: echo ----- && make -v && echo ----- && - ECHO make -%MAKE_PARAMS%- && - make %MAKE_PARAMS% + ECHO -%MAKE_PARAMS%- && + %MAKE_PARAMS% ) ELSE ( ECHO *** && ECHO *** Building Visual Studio 2010 %PLATFORM%\%CONFIGURATION% && diff --git a/lib/lz4frame.h b/lib/lz4frame.h index 63d61ad..6b6e320 100644 --- a/lib/lz4frame.h +++ b/lib/lz4frame.h @@ -66,7 +66,7 @@ extern "C" { #endif #if defined(_MSC_VER) -# define LZ4F_DEPRECATE(x) __declspec(deprecated) x +# define LZ4F_DEPRECATE(x) x /* __declspec(deprecated) x - only works with C++ */ #elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 6)) # define LZ4F_DEPRECATE(x) x __attribute__((deprecated)) #else -- cgit v0.12