From 7f5cd4786a9ec19a1b936a98ddc30638356d89aa Mon Sep 17 00:00:00 2001 From: eugene Date: Wed, 12 May 2021 08:50:36 -0400 Subject: [PATCH 1/3] use proper formatting macros when using MinGW provided stdio Signed-off-by: eugene --- include/mbedtls/debug.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/mbedtls/debug.h b/include/mbedtls/debug.h index dd20ba087..3c08244f3 100644 --- a/include/mbedtls/debug.h +++ b/include/mbedtls/debug.h @@ -94,8 +94,13 @@ */ #if defined(__has_attribute) #if __has_attribute(format) +#if defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 1 #define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check) \ - __attribute__((format (printf, string_index, first_to_check))) + __attribute__((__format__ (gnu_printf, string_index, first_to_check))) +#else /* defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 1 */ +#define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check) \ + __attribute__((format(printf, string_index, first_to_check))) +#endif #else /* __has_attribute(format) */ #define MBEDTLS_PRINTF_ATTRIBUTE(string_index, first_to_check) #endif /* __has_attribute(format) */ @@ -115,14 +120,14 @@ * * This module provides debugging functions. */ -#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1800) +#if (defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER < 1800) #include #define MBEDTLS_PRINTF_SIZET PRIuPTR #define MBEDTLS_PRINTF_LONGLONG "I64d" -#else /* defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1800) */ +#else /* (defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER < 1800) */ #define MBEDTLS_PRINTF_SIZET "zu" #define MBEDTLS_PRINTF_LONGLONG "lld" -#endif /* defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1800) */ +#endif /* (defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER < 1800) */ #ifdef __cplusplus extern "C" { From 98d2fe9f8516f96075405d42c742d22ab421fc0a Mon Sep 17 00:00:00 2001 From: eugene Date: Wed, 12 May 2021 12:33:36 -0400 Subject: [PATCH 2/3] add changelog entry Signed-off-by: eugene --- ChangeLog.d/fix-mingw-build.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 ChangeLog.d/fix-mingw-build.txt diff --git a/ChangeLog.d/fix-mingw-build.txt b/ChangeLog.d/fix-mingw-build.txt new file mode 100644 index 000000000..b5255beb3 --- /dev/null +++ b/ChangeLog.d/fix-mingw-build.txt @@ -0,0 +1,4 @@ +Changes + * fix build failure on MinGW toolchain when __USE_MING_ANSI_STDIO is on. + When that flag is on, standard GNU C printf format specifiers should be used. + From 3239eff409424e527f6df08b72e605124604ddce Mon Sep 17 00:00:00 2001 From: eugene Date: Wed, 12 May 2021 14:37:24 -0400 Subject: [PATCH 3/3] fix changelog entry Signed-off-by: eugene --- ChangeLog.d/fix-mingw-build.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.d/fix-mingw-build.txt b/ChangeLog.d/fix-mingw-build.txt index b5255beb3..383b1c7fd 100644 --- a/ChangeLog.d/fix-mingw-build.txt +++ b/ChangeLog.d/fix-mingw-build.txt @@ -1,4 +1,5 @@ Changes * fix build failure on MinGW toolchain when __USE_MING_ANSI_STDIO is on. - When that flag is on, standard GNU C printf format specifiers should be used. + When that flag is on, standard GNU C printf format specifiers + should be used.