From d44ec48b1c6e84297b1f608e799b72adb195a8d2 Mon Sep 17 00:00:00 2001 From: inikep Date: Mon, 9 May 2016 14:37:41 +0200 Subject: [PATCH] detection of snprintf for Visual <= 2012 --- appveyor.yml | 4 +++- lib/common/util.h | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 04fea761e..303c63172 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,9 @@ platform: - x64 environment: matrix: + - PlatformToolset: v100 - PlatformToolset: v110 + - PlatformToolset: v120 - PlatformToolset: v140 build_script: - cmd: >- @@ -16,7 +18,7 @@ build_script: msbuild "visual\2013\zstd.sln" /m /verbosity:minimal /property:PlatformToolset=%PlatformToolset% /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" test_script: - cmd: >- - ECHO %APPVEYOR_BUILD_FOLDER%\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe %FUZZERTEST% + ECHO %APPVEYOR_BUILD_FOLDER%\visual\2013\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe %FUZZERTEST% SET FUZZERTEST=-T5mn diff --git a/lib/common/util.h b/lib/common/util.h index 61b542957..a548b4aec 100644 --- a/lib/common/util.h +++ b/lib/common/util.h @@ -46,9 +46,12 @@ extern "C" { # define _CRT_SECURE_NO_WARNINGS /* Disable some Visual warning messages for fopen, strncpy */ # define _CRT_SECURE_NO_DEPRECATE /* VS2005 */ # pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */ -# define snprintf sprintf_s /* snprintf unsupported by Visual <= 2012 */ -//# define snprintf _snprintf +#if _MSC_VER <= 1700 /* (1700 = Visual Studio 2012) */ + #define snprintf sprintf_s /* snprintf unsupported by Visual <= 2012 */ + //#define snprintf _snprintf #endif +#endif + /* Unix Large Files support (>4GB) */ #if !defined(__LP64__) /* No point defining Large file for 64 bit */