commit bc18eb3b928e861d0b71f7792cafbf2ad4c38972
author Ron Eldor <ron.eldor@arm.com> Wed Sep 06 17:49:10 2017 +0300
committer Ron Eldor <ron.eldor@arm.com> Wed Sep 06 17:51:14 2017 +0300
tree cbb9e146da52037ab2b626a2b3a0816653e2fdff
parent 72ea31b026e1fc61b01662474aa5125817b968bc

Fix compilation error with Mingw32

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

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 227faed..f8dcae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS x.x.x branch released xxxx-xx-xx
+
+Bugfix
+   * 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
+
 = mbed TLS 2.6.0 branch released 2017-08-10
 
 Security

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 af3b2f1..68506f5 100644
--- a/library/platform.c
+++ b/library/platform.c
@@ -74,7 +74,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 );