Signed-off-by: Martin Storsjö <mar...@martin.st> --- This patch is new for v2 of the patchset. --- mingw-w64-headers/crt/_mingw_mac.h | 8 ++++---- mingw-w64-headers/crt/stdio.h | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/mingw-w64-headers/crt/_mingw_mac.h b/mingw-w64-headers/crt/_mingw_mac.h index 532be1381..30ade2ebc 100644 --- a/mingw-w64-headers/crt/_mingw_mac.h +++ b/mingw-w64-headers/crt/_mingw_mac.h @@ -281,16 +281,16 @@ __attribute__((__format__(__scanf__, __format,__args))) #else #define __MINGW_MS_PRINTF(__format,__args) \ - __attribute__((__format__(ms_printf, __format,__args))) + __attribute__((__format__(__ms_printf__, __format,__args))) #define __MINGW_MS_SCANF(__format,__args) \ - __attribute__((__format__(ms_scanf, __format,__args))) + __attribute__((__format__(__ms_scanf__, __format,__args))) #define __MINGW_GNU_PRINTF(__format,__args) \ - __attribute__((__format__(gnu_printf,__format,__args))) + __attribute__((__format__(__gnu_printf__,__format,__args))) #define __MINGW_GNU_SCANF(__format,__args) \ - __attribute__((__format__(gnu_scanf, __format,__args))) + __attribute__((__format__(__gnu_scanf__, __format,__args))) #endif /* !__clang__ */ #undef __mingw_ovr diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h index 60c83b94e..c22122c33 100644 --- a/mingw-w64-headers/crt/stdio.h +++ b/mingw-w64-headers/crt/stdio.h @@ -255,14 +255,14 @@ extern #undef __MINGW_SCANF_FORMAT #if defined(__clang__) -#define __MINGW_PRINTF_FORMAT printf -#define __MINGW_SCANF_FORMAT scanf +#define __MINGW_PRINTF_FORMAT __printf__ +#define __MINGW_SCANF_FORMAT __scanf__ #elif defined(_UCRT) || __USE_MINGW_ANSI_STDIO -#define __MINGW_PRINTF_FORMAT gnu_printf -#define __MINGW_SCANF_FORMAT gnu_scanf +#define __MINGW_PRINTF_FORMAT __gnu_printf__ +#define __MINGW_SCANF_FORMAT __gnu_scanf__ #else -#define __MINGW_PRINTF_FORMAT ms_printf -#define __MINGW_SCANF_FORMAT ms_scanf +#define __MINGW_PRINTF_FORMAT __ms_printf__ +#define __MINGW_SCANF_FORMAT __ms_scanf__ #endif #if __USE_MINGW_ANSI_STDIO && !defined(_CRTBLD) -- 2.34.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
