diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 81da122dab4..8776b1f5b65 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-28  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* decl.c (grokfndecl): Remove the setting
+	of the return type of the function type
+	of main after erroring about must returning
+	int.
+
 2005-10-28  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR C++/23229
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 07278ff9a1c..7e38ec3dff1 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5722,7 +5722,6 @@ grokfndecl (tree ctype,
 	  newtype =  build_function_type (integer_type_node,
 			  		  oldtypeargs);
 	  TREE_TYPE (decl) = newtype;
-	  TREE_TYPE (TREE_TYPE (decl)) = integer_type_node;
 	}
       inlinep = 0;
       publicp = 1;