diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 97272e896..989da3b19 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-04  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/wchar.h (WCHAR_MAX): Define as 0xffff, so preprocessor
+	#if (WCHAR_MAX <= WCHAR_MIN) is false.
+	* include/stdint.h (WCHAR_MAX): Likwise.
+	(WINT_MAX): Likewise.
+
 2005-05-03  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* mingwex/math/signbit.c (__signbit):  Make return value
diff --git a/winsup/mingw/include/stdint.h b/winsup/mingw/include/stdint.h
index 2ea752fa3..5241d48b3 100644
--- a/winsup/mingw/include/stdint.h
+++ b/winsup/mingw/include/stdint.h
@@ -137,14 +137,14 @@ typedef unsigned long long   uintmax_t;
 
 #ifndef WCHAR_MIN  /* also in wchar.h */ 
 #define WCHAR_MIN 0
-#define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */
+#define WCHAR_MAX 0xffff /* UINT16_MAX */
 #endif
 
 /*
  * wint_t is unsigned short for compatibility with MS runtime
  */
 #define WINT_MIN 0
-#define WINT_MAX ((wint_t)-1) /* UINT16_MAX */
+#define WINT_MAX 0xffff /* UINT16_MAX */
 
 #endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */
 
diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h
index 54dc17f3d..2f5c6a945 100644
--- a/winsup/mingw/include/wchar.h
+++ b/winsup/mingw/include/wchar.h
@@ -51,7 +51,7 @@
 #endif /* __STRICT_ANSI__ */
 
 #define WCHAR_MIN	0
-#define WCHAR_MAX	((wchar_t)-1)
+#define WCHAR_MAX	0xffff
 
 #ifndef WEOF
 #define	WEOF	(wchar_t)(0xFFFF)