From c6c8c4002cb766f203b3815c190078f727ab50b5 Mon Sep 17 00:00:00 2001 From: keithmarshall Date: Tue, 1 Sep 2009 20:41:55 +0000 Subject: [PATCH] Avoid multiple link time definitions of _printf() for C++ --- winsup/mingw/ChangeLog | 8 ++++++++ winsup/mingw/include/stdio.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index 0cbef444f2..27c4089da5 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,11 @@ +2009-09-01 Keith Marshall + + Avoid multiple link time definitions of _printf() for C++; + (problem reported by Alexander Shaduri, via MinGW-users ML). + + * include/stdio.h [__USE_MINGW_ANSI_STDIO]: + (__mingw_stdio_redirect__) [__cplusplus]: remove `static' keyword. + 2009-08-14 Chris Sutcliffe * include/_mingw.h: Increment version to 3.16. diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h index b7ed9b757d..11a92eac08 100644 --- a/winsup/mingw/include/stdio.h +++ b/winsup/mingw/include/stdio.h @@ -220,7 +220,7 @@ extern int __mingw_stdio_redirect__(vsnprintf)(char*, size_t, const char*, __VAL * For C++ we use inline implementations, to avoid interference * with namespace qualification, which may result from using #defines. */ -# define __mingw_stdio_redirect__ static inline __cdecl __MINGW_NOTHROW +# define __mingw_stdio_redirect__ inline __cdecl __MINGW_NOTHROW # elif defined __GNUC__ /* -- 2.11.0