Avoid multiple link time definitions of _printf() for C++

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 0cbef444f2287a84ea93b95ae4aaefb521a7bef0..27c4089da5938036029f36a967f454f06d005658 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-01  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       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 <ir0nh34d@users.sourceforge.net>
 
        * include/_mingw.h: Increment version to 3.16.

diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h
index b7ed9b757d6c03cd588d6a0e3437f62006337adb..11a92eac08fa4691fc5a3cb466fb2454fe858d32 100644 (file)
--- 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__
 /*