diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 7e930edfc..217dcea6f 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,4 +1,11 @@
-2008-03-21  Danny Smith  <dannysmith@users.sourceforge.net>
+2008-04-25  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/wchar.h (fwide): Return success code rather than failure in inline
+	definition.
+	* mingwex/fwide.c (fwide): ANSI-fy. Get rid of Q8 comments.  Return success
+	code rather than failure.
+
+2008-03-21  Danny Smith
 
 	* include/math.h (float_t, double_t): Define.
 
diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h
index 0dff3c181..1d3181f75 100644
--- a/winsup/mingw/include/wchar.h
+++ b/winsup/mingw/include/wchar.h
@@ -291,8 +291,8 @@ 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 */
+					       int mode)
+  {return mode;} /* Nothing to do  */
 __CRT_INLINE int __cdecl __MINGW_NOTHROW mbsinit(const mbstate_t* __UNUSED_PARAM(ps))
   {return 1;}
 #endif
diff --git a/winsup/mingw/mingwex/fwide.c b/winsup/mingw/mingwex/fwide.c
index aba863970..79d5848f7 100644
--- a/winsup/mingw/mingwex/fwide.c
+++ b/winsup/mingw/mingwex/fwide.c
@@ -1,26 +1,9 @@
-/*	This source code was extracted from the Q8 package created and placed
-    in the PUBLIC DOMAIN by Doug Gwyn <gwyn@arl.mil>
-    last edit:	1999/11/05	gwyn@arl.mil
-
-    Implements subclause 7.24 of ISO/IEC 9899:1999 (E).
-
-	This is a minimal implementation for environments where
-	internationalization is not considered important.
-
-	It supports an encoding where all char codes are mapped
-	to the *same* code values within a wchar_t or wint_t,
-	so long as no other wchar_t codes are used by the program.
-
-*/
-
 #include	<wchar.h>
 #include	<stdio.h>
 
 int
-fwide(stream, mode)
-	FILE	*stream;
-	int		mode;
-	{
-	return -1;			/* limited to byte orientation */
-	}
+fwide(FILE* stream, int mode)
+{
+  return mode; /* Nothing to do.  */
+}