diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5c8f92062ee1..c1da777727b6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-04  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* cppdefault.h (WINT_TYPE): Define.
+	* cppinit.c (builtin_array): Define __WINT_TYPE__.
+	* tradcpp.c (initialize_builtins): Define __WINT_TYPE__.
+	* tm.texi (NO_BUILTIN_WINT_TYPE, WINT_TYPE): Document.
+
 Fri Aug  4 06:53:46 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
 	* (mips_legitimate_address_p): Don't allow register+offset              
diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
index 58ff9396460f..db7063cd662d 100644
--- a/gcc/cppdefault.h
+++ b/gcc/cppdefault.h
@@ -66,6 +66,12 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define WCHAR_TYPE "int"
 #endif
 
+/* The string value for __WINT_TYPE__.  */
+
+#ifndef WINT_TYPE
+#define WINT_TYPE "unsigned int"
+#endif
+
 /* The string value for __USER_LABEL_PREFIX__ */
 
 #ifndef USER_LABEL_PREFIX
diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 2499a90e1dc2..c845028d3570 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -531,6 +531,9 @@ static const struct builtin builtin_array[] =
 #ifndef NO_BUILTIN_WCHAR_TYPE
   C("__WCHAR_TYPE__",		WCHAR_TYPE),
 #endif
+#ifndef NO_BUILTIN_WINT_TYPE
+  C("__WINT_TYPE__",		WINT_TYPE),
+#endif
 
   /* Named operators known to the preprocessor.  These cannot be #defined
      and always have their stated meaning.  They are treated like normal
diff --git a/gcc/tradcpp.c b/gcc/tradcpp.c
index a66123631a3d..5e88c0229893 100644
--- a/gcc/tradcpp.c
+++ b/gcc/tradcpp.c
@@ -4643,6 +4643,9 @@ initialize_builtins ()
 #endif
 #ifndef NO_BUILTIN_WCHAR_TYPE
   install_value ("__WCHAR_TYPE__",        WCHAR_TYPE);
+#endif
+#ifndef NO_BUILTIN_WINT_TYPE
+  install_value ("__WINT_TYPE__",         WINT_TYPE);
 #endif
   install_value ("__REGISTER_PREFIX__",   REGISTER_PREFIX);
   install_value ("__USER_LABEL_PREFIX__", user_label_prefix);