From cc4d68ec0149df46a150eaab7f8eabdeb2a5e8af Mon Sep 17 00:00:00 2001
From: Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
Date: Fri, 21 Mar 2008 12:45:27 +0000
Subject: [PATCH] 2008-01-19 Danny Smith <dannysmithusers.sourceforge.net

        * inclue/wchar.h (fwide): Add prototype and guard inline definition.
        (mbsinit): Likewise.
---
 winsup/mingw/ChangeLog       | 6 ++++++
 winsup/mingw/include/wchar.h | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 9b7ff66e3..5fc7a8e94 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,4 +1,5 @@
 2008-02-08  Danny Smith  <dannysmith@users.sourceforge.net>
+
 	* mingwex/gdtoa/gdtoaimp.h (USE_LOCALE): Define.
 	* mingwex/gdtoa/mingw_snprintf.c: [USE_LOCALE] Include locale.h.
 	(x_sprintf): [USE_LOCALE] Use  *localeconv()->decimal_point.
@@ -13,6 +14,11 @@
 	* Makefile.in: Add rules to generate multiple versions of libmoldname.a for
 	the different runtime versions.
 
+2008-01-19 Danny Smith <dannysmithusers.sourceforge.net
+
+	* inclue/wchar.h (fwide): Add prototype and guard inline definition.
+	(mbsinit): Likewise.
+
 2007-12-27 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
 
 	* include/_mingw.h: Increment version to 3.14.
diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h
index 007994669..0dff3c181 100644
--- a/winsup/mingw/include/wchar.h
+++ b/winsup/mingw/include/wchar.h
@@ -287,11 +287,15 @@ size_t __cdecl __MINGW_NOTHROW wcsrtombs(char * __restrict__, const wchar_t ** _
 int __cdecl __MINGW_NOTHROW wctob(wint_t);
 
 #ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */
+int __cdecl __MINGW_NOTHROW fwide(FILE*, int);
+int __cdecl __MINGW_NOTHROW mbsinit(const mbstate_t*);
+#ifndef __NO_INLINE__
 __CRT_INLINE int __cdecl __MINGW_NOTHROW fwide(FILE* __UNUSED_PARAM(stream),
 			       int __UNUSED_PARAM(mode))
   {return -1;} /* limited to byte orientation */
 __CRT_INLINE int __cdecl __MINGW_NOTHROW mbsinit(const mbstate_t* __UNUSED_PARAM(ps))
   {return 1;}
+#endif
 wchar_t* __cdecl __MINGW_NOTHROW wmemset(wchar_t *, wchar_t, size_t);
 wchar_t* __cdecl __MINGW_NOTHROW wmemchr(const wchar_t*, wchar_t, size_t);
 int wmemcmp(const wchar_t*, const wchar_t *, size_t);