commit 19c3862d0c66711dc4e191c9949fd74978f55b15
author Gilles Peskine <Gilles.Peskine@arm.com> Sun Mar 11 00:10:34 2018 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Sun Mar 11 00:45:10 2018 +0100
tree 9678ae3bbbc6b3e3f85924483fa1ef99b8016b88
parent 34ba06fac80b09052e9d3d30c7e8eba34bafc783
parent 2f73c9342fd9d31728c0bf4fb34266fdcc489a88

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

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index eb8801a..0513ab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@
      is not enabled. Set MBEDTLS_SSL_MIN_MAJOR_VERSION
      and MBEDTLS_SSL_MIN_MINOR_VERSION instead of
      MBEDTLS_SSL_MAJOR_VERSION_3 and MBEDTLS_SSL_MINOR_VERSION_1. #664
+   * Fix compilation error on Mingw32 when _TRUNCATE is defined. Use _TRUNCATE
+     only if __MINGW32__ not defined. Fix suggested by Thomas Glanzmann and
+     Nick Wilson on issue #355
 
 Changes
    * Fix tag lengths and value ranges in the documentation of CCM encryption.

library/debug.c

diff --git a/library/debug.c b/library/debug.c
index f9229b3..db3924a 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -91,7 +91,7 @@
 
     va_start( argp, format );
 #if defined(_WIN32)
-#if defined(_TRUNCATE)
+#if defined(_TRUNCATE) && !defined(__MINGW32__)
     ret = _vsnprintf_s( str, DEBUG_BUF_SIZE, _TRUNCATE, format, argp );
 #else
     ret = _vsnprintf( str, DEBUG_BUF_SIZE, format, argp );

library/platform.c

diff --git a/library/platform.c b/library/platform.c
index 76df7fa..a295f9b 100644
--- a/library/platform.c
+++ b/library/platform.c
@@ -82,7 +82,7 @@
         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 );