Merge remote-tracking branch 'upstream-public/pr/1079' into development-proposed

This commit is contained in:
Gilles Peskine 2018-03-11 00:10:34 +01:00
commit 19c3862d0c
3 changed files with 5 additions and 2 deletions

View file

@ -82,7 +82,7 @@ int mbedtls_platform_win32_snprintf( char *s, size_t n, const char *fmt, ... )
return( -1 );
va_start( argp, fmt );
#if defined(_TRUNCATE)
#if defined(_TRUNCATE) && !defined(__MINGW32__)
ret = _vsnprintf_s( s, n, _TRUNCATE, fmt, argp );
#else
ret = _vsnprintf( s, n, fmt, argp );