diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8135d85e73e..4609d447aaa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-08  Neil Booth  <neil@daikokuya.co.uk>
+
+	* opts.c (wrap_help): Use unsigned int, not size_t.
+
 2003-07-08  Stephane Carrez  <stcarrez@nerim.fr>
 
 	* config/m68hc11/m68hc11.h (HAVE_AS_DWARF2_DEBUG_LINE): Don't define
diff --git a/gcc/opts.c b/gcc/opts.c
index ec8af200406..052703fd94e 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -1526,8 +1526,8 @@ print_help (void)
 static void
 wrap_help (const char *help, const char *item, size_t item_width)
 {
-  const size_t columns = 80, col_width = 27;
-  size_t remaining, room, len;
+  const unsigned int columns = 80, col_width = 27;
+  unsigned int remaining, room, len;
 
   remaining = strlen (help);
 
@@ -1538,7 +1538,7 @@ wrap_help (const char *help, const char *item, size_t item_width)
 
       if (room < len)
 	{
-	  size_t i;
+	  unsigned int i;
 
 	  for (i = 0; help[i]; i++)
 	    {