fix implicit int

From-SVN: r23760

405 files changed, 445 insertions, 417 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.benjamin/tem06.C b/gcc/testsuite/g++.old-deja/g++.benjamin/tem06.C
index 9fcd630..e55ee6a 100644
--- a/gcc/testsuite/g++.old-deja/g++.benjamin/tem06.C
+++ b/gcc/testsuite/g++.old-deja/g++.benjamin/tem06.C
@@ -19,7 +19,7 @@ void blah (const T &) {
   x (4);
 };
 
-main () {
+int main () {
   const foo<int> v;
   blah (v);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.bob/inherit1.C b/gcc/testsuite/g++.old-deja/g++.bob/inherit1.C
index 4e77de3..4d62e38 100644
--- a/gcc/testsuite/g++.old-deja/g++.bob/inherit1.C
+++ b/gcc/testsuite/g++.old-deja/g++.bob/inherit1.C
@@ -14,7 +14,7 @@ public:
     char* m1 () { C::m1(); return ""; } // ERROR - 
 };
 
-main () {
+int main () {
 A a;
 B b;
 C c;
diff --git a/gcc/testsuite/g++.old-deja/g++.bob/packed1.C b/gcc/testsuite/g++.old-deja/g++.bob/packed1.C
index 27ae03e..86a946f 100644
--- a/gcc/testsuite/g++.old-deja/g++.bob/packed1.C
+++ b/gcc/testsuite/g++.old-deja/g++.bob/packed1.C
@@ -1,3 +1,4 @@
+int
 main() {
   struct s
     {
diff --git a/gcc/testsuite/g++.old-deja/g++.bob/protected1.C b/gcc/testsuite/g++.old-deja/g++.bob/protected1.C
index e83f3e4..95a400e 100644
--- a/gcc/testsuite/g++.old-deja/g++.bob/protected1.C
+++ b/gcc/testsuite/g++.old-deja/g++.bob/protected1.C
@@ -36,6 +36,7 @@ void C::f() {
 }
 
 B b(3);
+int
 main() {
  A *z = &b; // ERROR - 
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.bob/template3.C b/gcc/testsuite/g++.old-deja/g++.bob/template3.C
index 1737842..7aca6ed 100644
--- a/gcc/testsuite/g++.old-deja/g++.bob/template3.C
+++ b/gcc/testsuite/g++.old-deja/g++.bob/template3.C
@@ -43,6 +43,7 @@ public:
     ExchangeableList	i_theWatchList; // Instruments being monitored
 };
 
+int
 main()
 {
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.bob/template4.C b/gcc/testsuite/g++.old-deja/g++.bob/template4.C
index 8d86fa3..1ef2057 100644
--- a/gcc/testsuite/g++.old-deja/g++.bob/template4.C
+++ b/gcc/testsuite/g++.old-deja/g++.bob/template4.C
@@ -14,6 +14,7 @@ class B {
     A w;
 };
 
+int
 main() {
   B<int> c;
   return c.f();
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/arm1.C b/gcc/testsuite/g++.old-deja/g++.brendan/arm1.C
index 74091f8..e415632 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/arm1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/arm1.C
@@ -3,6 +3,7 @@
 // GROUPS passed ARM-compliance
 // ARM $5.7, it's illegal to do math on a `void*'.
 
+int
 main()
 {
   void *p;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/bit-fields2.C b/gcc/testsuite/g++.old-deja/g++.brendan/bit-fields2.C
index f73168b..c77ce86 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/bit-fields2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/bit-fields2.C
@@ -5,7 +5,7 @@
 	    int i:8;
 	} s;
 	
-	main()
+	int main()
 	{
 	    int &ir = s.i;	// ERROR - address of bitfield
 	    int *ip = &s.i;	// ERROR - address of bitfield
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/bool1.C b/gcc/testsuite/g++.old-deja/g++.brendan/bool1.C
index bab9255..1e7b343 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/bool1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/bool1.C
@@ -1,5 +1,6 @@
 // Build don't link: 
 // GROUPS passed boolean
+int
 main()
 {
     typedef char Boolean; // Instrinsic.h
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
index 38242fb..27d959f 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy1.C
@@ -8,7 +8,7 @@ public:
   operator int () { return 0; }
 };
 
-
+int
 main ()
 {
   C c1 (1);
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy2.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy2.C
index 9f93755..0ecc1e9 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy2.C
@@ -64,7 +64,7 @@ void foo(Compound a)
   die (5);
 }
 
-
+int
 main()
 {
   Compound a;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy3.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy3.C
index 28b3306..3b1edd5 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy3.C
@@ -48,6 +48,7 @@ public:
 
 void Foo(B b) { b.Bar(); }
 
+int
 main()
 {
   B b;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy5.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy5.C
index db63d75..277940b 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy5.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy5.C
@@ -58,6 +58,7 @@ public:
 
 int operator != (const BaseClass irv, int x) { return irv.i != x; }
 
+int
 main ()
 {
     DerivedClass a;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
index c98d77f..e2f4e7a 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy7.C
@@ -19,6 +19,7 @@ public:
   A(const B &) { printf ("FAIL\n"); exit (1); }
 };
 
+int
 main()
 {
     A a;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/copy9.C b/gcc/testsuite/g++.old-deja/g++.brendan/copy9.C
index 9c5114a..59fd228 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/copy9.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/copy9.C
@@ -27,6 +27,7 @@ public:
 	ParseToken () { tok = 0; intval = 0;}
 };
 
+int
 main () {
 	ParseToken a;
 	a.tok = T_Float;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
index f03953a..a6c9226 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
@@ -18,6 +18,7 @@ class B : public A {
 	friend virtual void f2() { printf("i=%d j=%d\n",i,j); }// ERROR -  virtual.*// ERROR -  member.*// ERROR -  member.*
 };
 
+int
 main() {
 	A * a = new A;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash13.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash13.C
index a292d67..c375e9b 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash13.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash13.C
@@ -32,4 +32,5 @@ gen_op Spul_U_axis()
   U1 = Fe();
 }; // ERROR - reaches end of non-void function
 
+int
 main () {};
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash14.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash14.C
index d7a0de4..dc28121 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash14.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash14.C
@@ -11,6 +11,7 @@ public:
   int get_i() {return i;}
   };
 
+int
 main()
 {
   cl ob[3] = {1, 2, 3};
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash15.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash15.C
index a4b1ffa..56a7e75 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash15.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash15.C
@@ -12,6 +12,7 @@ class B : public A {
   virtual ~B() {cout << "executed ~B()\n";};
 };
 
+int
 main() {
   cout << "starting\n";
   B b;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash19.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash19.C
index 8186a76..1b8527d 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash19.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash19.C
@@ -1,4 +1,4 @@
-// Special g++ Options: 
+// Special g++ Options:
 // Build don't link: 
 // GROUPS passed old-abort
 typedef unsigned long _G_clock_t;
@@ -1394,7 +1394,7 @@ class queue : public object {
 		DESTROYER destroy_f;
 		STRINGER string_f;
 		int count;
-		swap()
+	        int swap()
 		{
 			QUEUE tmp = Q;
 			Q = Q2;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash29.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash29.C
index 855dd99..72bbdc7 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash29.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash29.C
@@ -11,6 +11,7 @@ struct GlobalAddress
 	GlobalAddress(Value *nvar){}// ERROR - .*
 };// ERROR -  candidates .*
 
+int
 main()
 {
 	new GlobalAddress(Value());		// internal error occured here// ERROR -  no matching function .*
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash30.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash30.C
index b54fe19..707e898 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash30.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash30.C
@@ -2,6 +2,7 @@
 // GROUPS passed old-abort
 #include <string>
 
+int
 main(void) {
 
   string a[] = {"Hello"};
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash33.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash33.C
index 061f5a9..d89fa7b 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash33.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash33.C
@@ -1,6 +1,7 @@
 // Build don't link: 
 // GROUPS passed old-abort
 extern void foo(void *);
+int
 main() {
 	foo((struct bar *)0);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash38.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash38.C
index d124c21..eeb70e1 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash38.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash38.C
@@ -31,6 +31,7 @@ template< class T,  int n> class Implicit : public T {
      BASE operator=(BASE t) { return T::operator=(t); }
 };
 
+int
 main() 
 {
   Implicit<Implicit<INTEGER, 2> ,  3> y;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash44.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash44.C
index dd35619..00a4df4 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash44.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash44.C
@@ -18,6 +18,7 @@ template <class T> void bug<T>::Foo(const int)
 {
 }
 
+int
 main()
 {
 	bug<char>	InstantiatedBug;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash47.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash47.C
index daf2bd8..9bdbb11 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash47.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash47.C
@@ -85,6 +85,7 @@ public:
     int i;
 };
 
+int
 main()
 {
     Ref<XRep> y;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash48.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash48.C
index 20882a8..6dc9da0 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash48.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash48.C
@@ -15,6 +15,7 @@ bug::bug(int size)
 	numbers = new internal(size * size);// ERROR -  no match.*
 }
 
+int
 main()
 {
 	bug test;// ERROR -  no match
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash5.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash5.C
index d884189..0e82e16 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash5.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash5.C
@@ -96,6 +96,7 @@ class	Dummy
 		Dummy()	{}
 };
 
+int
 main()
 {
 	SimpleSet<Dummy *>		bs1;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash50.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash50.C
index 58695a2..fd87d75 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash50.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash50.C
@@ -22,7 +22,7 @@ public:
 
 C &(C::*DD)(const C &x) = &C::operator=;
 
-main()
+int main()
 {
         &DD;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash54.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash54.C
index 0b85fa1..7d2a8a0 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash54.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash54.C
@@ -1,6 +1,6 @@
 // Build don't link: 
 // GROUPS passed old-abort
-main()
+int main()
 {
     int a[100], **p;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash57.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash57.C
index 48014c5..5032b3f 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash57.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash57.C
@@ -7,7 +7,7 @@ public:
   foo();
 };
 
-main()
+int main()
 {
   static foo& a = *(new foo);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash7.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash7.C
index c55cab9..19476fc 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash7.C
@@ -1,5 +1,6 @@
 // Build don't link: 
 // GROUPS passed templates
+
 template<class T>
 class Vector
 {
@@ -16,7 +17,7 @@ template<class T>// ERROR - previous definition of T
 struct Comparator
 {
   typedef T T;// ERROR - use of template type T in typedef to T
-  static lessthan (T &a, T &b) { return a < b; }
+  static int lessthan (T &a, T &b) { return a < b; }
 };
 
 template<class Comp>
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/enum1.C b/gcc/testsuite/g++.old-deja/g++.brendan/enum1.C
index 7ec648f..9cc3ed8 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/enum1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/enum1.C
@@ -7,7 +7,7 @@ public:
 
 class derv : public foo { };
 
-main()
+int main()
 {
   foo::bar x = foo::baz;
   derv::bar y = derv::bat;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/enum2.C b/gcc/testsuite/g++.old-deja/g++.brendan/enum2.C
index 58da846..1c5c50b 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/enum2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/enum2.C
@@ -12,7 +12,7 @@ public:
 
 class derv : public foo, public foo2 { };
 
-main()
+int main()
 {
   foo::bar x = foo::baz;
   derv::bar2 y = derv::bat2;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/enum5.C b/gcc/testsuite/g++.old-deja/g++.brendan/enum5.C
index 2fa1ea3..32134ef 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/enum5.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/enum5.C
@@ -3,7 +3,7 @@
 // GROUPS passed enums
 enum Thing { FIRST, SECOND } ;
 
-main()
+int main()
 {
     Thing x = FIRST ;
     x = 27 ;          // this line should be a type error.// ERROR - .*
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/friend1.C b/gcc/testsuite/g++.old-deja/g++.brendan/friend1.C
index 8d942c7..9aea460 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/friend1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/friend1.C
@@ -16,4 +16,4 @@ public:
 
 B b;
 
-main () {}
+int main () {}
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/groff1.C b/gcc/testsuite/g++.old-deja/g++.brendan/groff1.C
index f6ca712..179ef30 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/groff1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/groff1.C
@@ -20,7 +20,7 @@ public:
   void *lookup(const char *) {}
 };
 
-main()
+int main()
 {
   char buf[2048];
   dictionary exceptions;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/init12.C b/gcc/testsuite/g++.old-deja/g++.brendan/init12.C
index f3c03e0..7d7c13a 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/init12.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/init12.C
@@ -2,7 +2,7 @@
 // GROUPS passed array-bindings
 char * bob();
 
-main()
+int main()
 {
     char a[1][2];
     a[0] = bob();// ERROR - .*
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/init3.C b/gcc/testsuite/g++.old-deja/g++.brendan/init3.C
index 91b2f7c..b86c2c7 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/init3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/init3.C
@@ -31,7 +31,7 @@ public:
 // bar1 should get built before bar2
 foo::foo (int x, int y) : b(x), a(y) {}
 
-main()
+int main()
 {
   foo f (1, 2);
   printf ("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/misc14.C b/gcc/testsuite/g++.old-deja/g++.brendan/misc14.C
index 7d57e30..024566f 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/misc14.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/misc14.C
@@ -9,4 +9,4 @@ public:
     static int New(int);// ERROR -  declaration.*
 };
 
-main() {}
+int main() {}
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C b/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
index 078dbc9..af07d6f 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/misc7.C
@@ -1,7 +1,7 @@
 // GROUPS passed miscellaneous
 extern "C" void printf (char *, ...);
 
-main()
+int main()
 {
   int i = 0;
   // Make sure build_unary_op correctly computes this.
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/misc8.C b/gcc/testsuite/g++.old-deja/g++.brendan/misc8.C
index 7efad41..b2aa92f 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/misc8.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/misc8.C
@@ -12,7 +12,7 @@ foo::foo(int a)
     foo::a=a;
 }
 
-main()
+int main()
 {
 foo     obj(4);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/nest10.C b/gcc/testsuite/g++.old-deja/g++.brendan/nest10.C
index 751440d..d22e307 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/nest10.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/nest10.C
@@ -25,6 +25,6 @@ void A::B::g (int val)
 	}
 
 
-main ()
+int main ()
 	{
 	}
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/nest21.C b/gcc/testsuite/g++.old-deja/g++.brendan/nest21.C
index c4eb0ee..f32166d 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/nest21.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/nest21.C
@@ -71,7 +71,7 @@ Dump2::operator<<(double r)
   strcpy (output, tempout);
   return *this; }
 
-main()
+int main()
 {
     BDDRetrace::Dump1 d1;
     Dump2 d2;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/nest3.C b/gcc/testsuite/g++.old-deja/g++.brendan/nest3.C
index 16e7df8..bedd519 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/nest3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/nest3.C
@@ -9,4 +9,4 @@ public:
 
 X::M2 X::g(int i) { X::M2 m2; return m2; }
 
-main() { }
+int main() { }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/new-array.C b/gcc/testsuite/g++.old-deja/g++.brendan/new-array.C
index 5341010..3080a58 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/new-array.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/new-array.C
@@ -13,6 +13,6 @@ void MakeBug() {
 	job = new AStruct;
 }
 
-main () {
+int main () {
 	MakeBug();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/operators1.C b/gcc/testsuite/g++.old-deja/g++.brendan/operators1.C
index 6146eb4..89453f9 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/operators1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/operators1.C
@@ -8,7 +8,7 @@ int operator()(A x,float y) { // MUST be a member function// ERROR - .*
 	return 1;
 }
 
-main() {
+int main() {
 	A x;
 	x(1.0); // ERROR - no match for call
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/overload1.C b/gcc/testsuite/g++.old-deja/g++.brendan/overload1.C
index 5658fdd..e5040fd 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/overload1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/overload1.C
@@ -12,7 +12,7 @@ public:
       int f (int); // ERROR - candidates are
 };
 
-main ()
+int main ()
 {
   Bar b;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C b/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
index 0c39e0d..ec2685c 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/overload7.C
@@ -24,7 +24,7 @@ class Casted {
         operator double() const { return y; }
 };
 
-main()
+int main()
 {
         Casted c(10,12.34);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/overload8.C b/gcc/testsuite/g++.old-deja/g++.brendan/overload8.C
index 6057ebe..71d1689 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/overload8.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/overload8.C
@@ -4,6 +4,6 @@ typedef struct{double re,im;} complex;
 class Complex{public:double re,im;
     inline void operator=(Complex&X){re=X.re; im=X.im;};};
 void zxcvbnm(int n,...){n=1;}
-main(){complex c; Complex C;
+int main(){complex c; Complex C;
 zxcvbnm(1,c);
 zxcvbnm(1,C);}
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/overload9.C b/gcc/testsuite/g++.old-deja/g++.brendan/overload9.C
index 2d5dfa3..93a0cbf 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/overload9.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/overload9.C
@@ -11,7 +11,7 @@ class CGLogger : public CLogger
 {
 } GLog;
 
-main()
+int main()
 {
         Log(1,"Test");// ERROR -  call of.*
         Log(1,"Test %d",3);
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/parse1.C b/gcc/testsuite/g++.old-deja/g++.brendan/parse1.C
index 76bfb0e..0c62c03 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/parse1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/parse1.C
@@ -9,7 +9,7 @@ public:
   void  mf() { s='\"'; }
 };
 
-main()
+int main()
 {
   Try x;
   x.mf();
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/parse4.C b/gcc/testsuite/g++.old-deja/g++.brendan/parse4.C
index d60cefe..6526c60 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/parse4.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/parse4.C
@@ -14,7 +14,7 @@ public:
 
 int g() { return 0; } // gets bogus error - referenced below XFAIL *-*-*
 
-main()
+int main()
 {
     int try1;
     B( try1 ).f();   // no syntax error
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/parse6.C b/gcc/testsuite/g++.old-deja/g++.brendan/parse6.C
index 9fcf2ad..d5ece06 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/parse6.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/parse6.C
@@ -7,7 +7,7 @@
 
 class A { };
 
-main()  {
+int main()  {
   A a = a;
   A b(b); // gets bogus error - XFAIL *-*-*
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/prepost1.C b/gcc/testsuite/g++.old-deja/g++.brendan/prepost1.C
index ba1a208..e1b18bc 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/prepost1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/prepost1.C
@@ -5,7 +5,7 @@ public:
       operator ++ (); // ERROR - no type or storage class
 };
 
-main()
+int main()
 {
   foo x;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C b/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
index ca9c21c..58a10dc 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/ptolemy2.C
@@ -62,7 +62,7 @@ int PTcl::three(int, char** argv) {
 	return 0;
 }
 
-main (int argc, char** argv) {
+int main (int argc, char** argv) {
 	PTcl obj;
 	obj.dispatcher(1,argc,argv);
 	return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/recurse.C b/gcc/testsuite/g++.old-deja/g++.brendan/recurse.C
index 93baa44..639dfb3 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/recurse.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/recurse.C
@@ -71,7 +71,7 @@ public:
   friend class DataBase;
 };
 
-main()
+int main()
 {
   DBpathrec a(), b();
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/scope2.C b/gcc/testsuite/g++.old-deja/g++.brendan/scope2.C
index 7085716..fccd1d6 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/scope2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/scope2.C
@@ -21,7 +21,7 @@ B GLOBAL_B;
 
 B& foo() {return GLOBAL_B;}
 
-main()
+int main()
 {
   // build_scoped_method_call and build_scoped_ref should know how
   // to deal with a reference for this
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/static2.C b/gcc/testsuite/g++.old-deja/g++.brendan/static2.C
index 1e050e2..8fd5ffc 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/static2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/static2.C
@@ -13,7 +13,7 @@ class A
         }
 };
 
-main()
+int main()
 {
         A::staticMember();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template11.C b/gcc/testsuite/g++.old-deja/g++.brendan/template11.C
index 55fa2b2..4a953a3 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template11.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template11.C
@@ -37,7 +37,7 @@ struct myStruct
   int action() {return 24;};
 };
 
-main()
+int main()
 {
   myStruct toto;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template2.C b/gcc/testsuite/g++.old-deja/g++.brendan/template2.C
index 07e2e66..ca60fa7 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template2.C
@@ -9,6 +9,6 @@ public:
 template <class Q>
 int Conc<Q>::body() {return 0;}
 
-main () {
+int main () {
 	Conc<int> s2;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template20.C b/gcc/testsuite/g++.old-deja/g++.brendan/template20.C
index 7f5c4ac..da26f9a 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template20.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template20.C
@@ -15,7 +15,7 @@ public :
     int find();
 };
 
-main()
+int main()
 {
     int z = Foo::bar.find();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template22.C b/gcc/testsuite/g++.old-deja/g++.brendan/template22.C
index a977e2f..28c70b3 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template22.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template22.C
@@ -14,7 +14,7 @@ func (int const& i)
 {}
 
 
-main ()
+int main ()
 { 
   Foo<int const> foo;
   printf ("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template24.C b/gcc/testsuite/g++.old-deja/g++.brendan/template24.C
index 7d67702..34549a0 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template24.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template24.C
@@ -11,7 +11,7 @@ public:
 
 int func (int h = 1, int z = 2) { return h+z; }
 
-main ()
+int main ()
 {
   Temp<int(*)(int, int)> temp (func);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template28.C b/gcc/testsuite/g++.old-deja/g++.brendan/template28.C
index 3ae4caf..48ae7fb 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template28.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template28.C
@@ -7,7 +7,7 @@ public:
         operator const char*() { return fptr; }
 };
 
-main(){
+int main(){
         X x1("1234");
         X x2(x1+1);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template29.C b/gcc/testsuite/g++.old-deja/g++.brendan/template29.C
index fa81995..2c427d9 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template29.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template29.C
@@ -9,4 +9,4 @@
     template <class ElementType> ElementType A<ElementType>::get() const
     { return ElementType(0); }
 
-    main() { const A<short> a(3); }
+int main() { const A<short> a(3); }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/template8.C b/gcc/testsuite/g++.old-deja/g++.brendan/template8.C
index 0a24617..80adbe1 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/template8.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/template8.C
@@ -10,7 +10,7 @@ union Double_alignt{
 
 };
 
-main(){
+int main(){
 
 	
 	Double_alignt<20000> heap;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/temporary1.C b/gcc/testsuite/g++.old-deja/g++.brendan/temporary1.C
index 5258edf..8c6d4c3 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/temporary1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/temporary1.C
@@ -2,7 +2,7 @@
 // GROUPS passed temporaries
 #include <stdio.h>
 
-main ()
+int main ()
 {
         int a = 2;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/flow1.C b/gcc/testsuite/g++.old-deja/g++.eh/flow1.C
index 81c70af..024670c 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/flow1.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/flow1.C
@@ -5,7 +5,7 @@ int bar ()
   throw 100;
 }
 
-main ()
+int main ()
 {
   int i = 0;			// this gets deleted after flow analysis
   try
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/new1.C b/gcc/testsuite/g++.old-deja/g++.eh/new1.C
index 3f7ebbc..1671dbb 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/new1.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/new1.C
@@ -17,7 +17,7 @@ void foo (B*);
 
 int newed, created;
 
-main ()
+int main ()
 {
   try {
     foo (new B (A ()));
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/new2.C b/gcc/testsuite/g++.old-deja/g++.eh/new2.C
index 6699f94..17bea5e 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/new2.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/new2.C
@@ -17,7 +17,7 @@ void foo (B*);
 
 int newed, created;
 
-main ()
+int main ()
 {
   try {
     foo (new B (A ()));
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/pdel1.C b/gcc/testsuite/g++.old-deja/g++.eh/pdel1.C
index b30b402..b8e553c 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/pdel1.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/pdel1.C
@@ -12,7 +12,7 @@ struct A {
 
 void * operator new (size_t size, int, int) { return operator new (size); }
 
-main ()
+int main ()
 {
   try {
     A* ap = new (1, 5) A;
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/pdel2.C b/gcc/testsuite/g++.old-deja/g++.eh/pdel2.C
index c9b9bd1..12efcd3 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/pdel2.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/pdel2.C
@@ -12,7 +12,7 @@ struct A {
 
 void * operator new (size_t size, int, int) { return operator new (size); }
 
-main ()
+int main ()
 {
   try {
     A* ap = new (1, 5) A;
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/rethrow3.C b/gcc/testsuite/g++.old-deja/g++.eh/rethrow3.C
index bea447b..5da2081 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/rethrow3.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/rethrow3.C
@@ -31,7 +31,7 @@ eh_test (int level)
     }
 }
 
-main ()
+int main ()
 {
   std::set_terminate (&eh_terminate);
   eh_test (0);
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/spec1.C b/gcc/testsuite/g++.old-deja/g++.eh/spec1.C
index 8f45070..044af8c 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/spec1.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/spec1.C
@@ -13,7 +13,7 @@ f () throw (char, int, std::bad_exception)
   throw 'a';
 }
 
-main ()
+int main ()
 {
   std::set_terminate (my_term);
   std::set_unexpected (my_unexp);
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/spec2.C b/gcc/testsuite/g++.old-deja/g++.eh/spec2.C
index 41774bf..d0269b3 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/spec2.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/spec2.C
@@ -13,7 +13,7 @@ f () throw (int, std::bad_exception)
   throw 'a';
 }
 
-main ()
+int main ()
 {
   std::set_terminate (my_term);
   std::set_unexpected (my_unexp);
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/spec3.C b/gcc/testsuite/g++.old-deja/g++.eh/spec3.C
index 602cd6f..57b29d4 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/spec3.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/spec3.C
@@ -13,7 +13,7 @@ f () throw (std::bad_exception)
   throw 'a';
 }
 
-main ()
+int main ()
 {
   std::set_terminate (my_term);
   std::set_unexpected (my_unexp);
diff --git a/gcc/testsuite/g++.old-deja/g++.eh/spec4.C b/gcc/testsuite/g++.old-deja/g++.eh/spec4.C
index adcf675..a92f7f0 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/spec4.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/spec4.C
@@ -13,7 +13,7 @@ f () throw (short)
   throw 'a';
 }
 
-main ()
+int main ()
 {
   std::set_terminate (my_term);
   std::set_unexpected (my_unexp);
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/default.C b/gcc/testsuite/g++.old-deja/g++.ext/default.C
index 24f336e..f434749 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/default.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/default.C
@@ -11,7 +11,7 @@ public:
 
 A*(*A::ptr)(int) = &A::func;
 
-main()
+int main()
 {
   A foo;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/null1.C b/gcc/testsuite/g++.old-deja/g++.ext/null1.C
index 6650cbe..ca1efff 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/null1.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/null1.C
@@ -2,7 +2,7 @@
 
 void f (int *) { }
 void f (char, char);
-main ()
+int main ()
 {
   f (__null);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/2371.C b/gcc/testsuite/g++.old-deja/g++.jason/2371.C
index a659b4e..b11db5e 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/2371.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/2371.C
@@ -502,7 +502,7 @@ operator<<(ostream& o, const SLS& s)
 SLS gsls;
 const SLS gcsls;
 
-foo()
+int foo()
 {
     const unsigned SIZE = 20;
 
@@ -563,7 +563,7 @@ foo()
 }
 
 // Dummy function so it'll run
-main()
+int main()
 {
   cout << "PASS" << endl;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access16.C b/gcc/testsuite/g++.old-deja/g++.jason/access16.C
index 16a132a..b8d43f3 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access16.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access16.C
@@ -14,7 +14,7 @@ public:
 	void bar() { b::foo(); } // gets bogus error
 };
 
-main() {
+int main() {
 	c test;
 	test.bar();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access22.C b/gcc/testsuite/g++.old-deja/g++.jason/access22.C
index 736a053..225ef6c 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access22.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access22.C
@@ -14,7 +14,7 @@ struct B : public A
     void func() { foo(); }	// ERROR - 
 };
 
-main()
+int main()
 {
     B b;
     b.func();
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access23.C b/gcc/testsuite/g++.old-deja/g++.jason/access23.C
index 5733168..74112aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access23.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access23.C
@@ -38,7 +38,7 @@ private:
 
 struct Bar : public Foo {
 public:
-  DoSomething() {
+  void DoSomething() {
     PUB_A = 0;
     Foo::A = 0;
     printf("%x\n",pX);  
@@ -57,7 +57,7 @@ public:
   }
 };
 
-main()
+int main()
 {
   Foo a;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/aggregate.C b/gcc/testsuite/g++.old-deja/g++.jason/aggregate.C
index b451b23..8128d8d 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/aggregate.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/aggregate.C
@@ -1,6 +1,6 @@
 struct A { int i; };
 
-main()
+int main()
 {
   A a1 = { 42 };
   A a2 (a1);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/binding.C b/gcc/testsuite/g++.old-deja/g++.jason/binding.C
index 0a013ab..cc6f25c 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/binding.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/binding.C
@@ -2,7 +2,7 @@
 
 struct T { ~T(); };
 
-main()
+int main()
 {
   foo:
    T t;				// ERROR - redeclared
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/bool2.C b/gcc/testsuite/g++.old-deja/g++.jason/bool2.C
index 4c0edcb..559b7d0 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/bool2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/bool2.C
@@ -5,7 +5,7 @@ struct F {
   bool b2 : 7;
 };
 
-main()
+int main()
 {
   F f = { true, true };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/bool4.C b/gcc/testsuite/g++.old-deja/g++.jason/bool4.C
index 36a2180..8c4695d 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/bool4.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/bool4.C
@@ -2,7 +2,7 @@
 
 struct A { };
 
-main ()
+int main ()
 {
   bool b = (void*)0;
   b = (int A::*)0;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/bool5.C b/gcc/testsuite/g++.old-deja/g++.jason/bool5.C
index 79d848c..8f8e37d 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/bool5.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/bool5.C
@@ -1,4 +1,4 @@
-main ()
+int main ()
 {
   bool b = false;
   int i = b++;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/bool6.C b/gcc/testsuite/g++.old-deja/g++.jason/bool6.C
index b8db872..493e25f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/bool6.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/bool6.C
@@ -3,7 +3,7 @@
 
 bool b;
 
-main ()
+int main ()
 {
   return ((!b) != 0);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/byval.C b/gcc/testsuite/g++.old-deja/g++.jason/byval.C
index 45fb1e2..bd17797 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/byval.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/byval.C
@@ -12,7 +12,7 @@ struct A {
 void foo (A a)
 { }
 
-main()
+int main()
 {
   foo (1);
   return count;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/cleanup2.C b/gcc/testsuite/g++.old-deja/g++.jason/cleanup2.C
index 21addfe..fdae1b7 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/cleanup2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/cleanup2.C
@@ -9,7 +9,7 @@ public:
 
 Class varOfClass;
 
-main() {
+int main() {
   // This MUST be 'const' to generate the error...
   const Class	arrayOfClass[1] = { varOfClass }; // causes abort
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/cond.C b/gcc/testsuite/g++.old-deja/g++.jason/cond.C
index 8f4da34..b613838 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/cond.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/cond.C
@@ -2,7 +2,7 @@
 // GROUPS passed rtti
 // Negative testcase for decls in conditions.
 
-main()
+int main()
 {
   float i;
   
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/cond2.C b/gcc/testsuite/g++.old-deja/g++.jason/cond2.C
index 890c319..9a8e045 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/cond2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/cond2.C
@@ -14,7 +14,7 @@ struct T
   operator int () { return i; }
 };
 
-main ()
+int main ()
 {
   int t;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/const2.C b/gcc/testsuite/g++.old-deja/g++.jason/const2.C
index 3aeae3c..7dd956b 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/const2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/const2.C
@@ -11,4 +11,4 @@ struct T {
 void T::f() { printf ("%p", &letter); }
 const char T::letter;               // still need def after class
 
-main() { }
+int main() { }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/const3.C b/gcc/testsuite/g++.old-deja/g++.jason/const3.C
index 49360a4..3ff8f0c 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/const3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/const3.C
@@ -4,7 +4,7 @@ extern int i;
 const int bar = i;
 int i = 5;
 
-main()
+int main()
 {
   return bar != 5;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/conversion6.C b/gcc/testsuite/g++.old-deja/g++.jason/conversion6.C
index 42b9ac2..a8477e3 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/conversion6.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/conversion6.C
@@ -30,7 +30,7 @@ typedef unsigned short Type;
 
 typedef Container<Type> TypeContainer;
 
-main(void)
+int main(void)
 {
     TypeContainer myTypeContainer(2);
     Type t = myTypeContainer;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/conversion8.C b/gcc/testsuite/g++.old-deja/g++.jason/conversion8.C
index fc4de81..0c3d378 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/conversion8.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/conversion8.C
@@ -1,6 +1,6 @@
 // PRMS id: 8279
 
-main ()
+int main ()
 {
   char *const *p = 0;
   char **q = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/crash8.C b/gcc/testsuite/g++.old-deja/g++.jason/crash8.C
index 4482a43..cadda2f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/crash8.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/crash8.C
@@ -2,7 +2,7 @@ struct A {
   A();
   A(A);				// ERROR - copy ctor must take reference
 };
-main()
+int main()
 {
   A a;
   A b(a);			// causes compiler segfault
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/ctor1.C b/gcc/testsuite/g++.old-deja/g++.jason/ctor1.C
index 06571e1..123295d 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/ctor1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/ctor1.C
@@ -15,7 +15,7 @@ void f(void)
   r = 0;
 }
 
-main()
+int main()
 {
   struct xx p;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/dcast2.C b/gcc/testsuite/g++.old-deja/g++.jason/dcast2.C
index 2ba1357..e42c71d 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/dcast2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/dcast2.C
@@ -2,7 +2,7 @@ struct A { virtual void f() { } };
 struct B { virtual void g() { } };
 struct C : public A, public B { };
 
-main ()
+int main ()
 {
   C* cp = 0;
   B* bp = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/dcast3.C b/gcc/testsuite/g++.old-deja/g++.jason/dcast3.C
index 1dc00a1..6d333f0 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/dcast3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/dcast3.C
@@ -14,7 +14,7 @@ struct C2 : public B2 { };
 struct D2 : public B2 { };
 struct E2 : public C2, public D2 { };
 
-main ()
+int main ()
 {
   E e;
   E2 e2;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/default1.C b/gcc/testsuite/g++.old-deja/g++.jason/default1.C
index e6ef577..0372d91 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/default1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/default1.C
@@ -9,7 +9,7 @@ int add(int const &symbol,
 int add_sym(int const &symbol,
 	    const unsigned char flags=0);
 
-main()
+int main()
 {
    int fname;
    add_sym(fname);      // Guarantee a symbol exists
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/defctor.C b/gcc/testsuite/g++.old-deja/g++.jason/defctor.C
index 252d43e..68cf25c 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/defctor.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/defctor.C
@@ -7,7 +7,7 @@ public:
 
 extern "C" int printf(const char *, ...);
 
-main () {
+int main () {
   A a;
   a.i = 1;
   A b (a);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/destruct.C b/gcc/testsuite/g++.old-deja/g++.jason/destruct.C
index a9d7e86..c5b3be6 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/destruct.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/destruct.C
@@ -15,7 +15,7 @@ public:
 
 typedef char * cp;
 
-main ()
+int main ()
 {
   A<int> a;
   A<cp> b;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/dot.C b/gcc/testsuite/g++.old-deja/g++.jason/dot.C
index 7f4bd77..3870eea 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/dot.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/dot.C
@@ -12,7 +12,7 @@ class Test
     void Print() { printf("%c", ch); }
 };
 
-main()
+int main()
 {
     Test *p = new Test('x');
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/dtor.C b/gcc/testsuite/g++.old-deja/g++.jason/dtor.C
index c9e7162..db76e17 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/dtor.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/dtor.C
@@ -6,7 +6,7 @@ struct B {
   ~B();
 };
 
-main()
+int main()
 {
   A a;
   a.~B();			// ERROR - wrong name
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/dtor2.C b/gcc/testsuite/g++.old-deja/g++.jason/dtor2.C
index 7f97513..c088e3f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/dtor2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/dtor2.C
@@ -4,7 +4,7 @@
 template <class T> struct A { };
 A<int> a;
 
-main()
+int main()
 {
   a.~A();			// gets bogus error
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/dtor5.C b/gcc/testsuite/g++.old-deja/g++.jason/dtor5.C
index 8ad14ea..4761bed 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/dtor5.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/dtor5.C
@@ -12,7 +12,7 @@ template <class T> struct A {
   ~A() { p[--i].~T(); r = i; }
 };
 
-main()
+int main()
 {
   { A<int> a; }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/enum8.C b/gcc/testsuite/g++.old-deja/g++.jason/enum8.C
index 811b44c..0a3220f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/enum8.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/enum8.C
@@ -14,7 +14,7 @@ int f (enum foo ef)
     }
 }
 
-main ()
+int main ()
 {
   return f (one);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/friend.C b/gcc/testsuite/g++.old-deja/g++.jason/friend.C
index ee6ee8d..4c517cb 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/friend.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/friend.C
@@ -12,7 +12,7 @@ struct B {
   friend void g () { f (); }
 };
 
-main ()
+int main ()
 {
   g ();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/groff1.C b/gcc/testsuite/g++.old-deja/g++.jason/groff1.C
index 79a9643..7ce697b 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/groff1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/groff1.C
@@ -29,7 +29,7 @@ void S::foo(const A &pos)
     exit (1);
 }
 
-main()
+int main()
 {
   A pos;
   pos.x = 17;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/hmc1.C b/gcc/testsuite/g++.old-deja/g++.jason/hmc1.C
index 751cf80..fec9487 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/hmc1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/hmc1.C
@@ -13,7 +13,7 @@ void Class<I>::func1(int n) {}
 //void Class<I>::func1(int n=1) {}
 //the code compiles.
 
-main() {
+int main() {
   Class<int> C;
   return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/init2.C b/gcc/testsuite/g++.old-deja/g++.jason/init2.C
index dcee918..c85adc3 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/init2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/init2.C
@@ -3,7 +3,7 @@
 extern int i, j;
 static const int foo [] = { i, j };
 int i = 5, j = 42;
-main()
+int main()
 {
   return foo[1] != 42;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/init3.C b/gcc/testsuite/g++.old-deja/g++.jason/init3.C
index bb3d0d8..ae86931 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/init3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/init3.C
@@ -35,7 +35,7 @@ My_string::My_string(const My_string &string)
    memcpy(str, string.str, len);
 }
 
-main()
+int main()
 {
    My_string str1 = strings[0];
    return strcmp ("first string", str1.char_p ()) != 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/inline.C b/gcc/testsuite/g++.old-deja/g++.jason/inline.C
index ac140ab..d6cb9e9 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/inline.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/inline.C
@@ -15,7 +15,7 @@ public:
   ~C() { }
 };
 #line 18 "inline.C"
-main()
+int main()
 {
   C<int> c;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/jump.C b/gcc/testsuite/g++.old-deja/g++.jason/jump.C
index 754e700..e59de36 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/jump.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/jump.C
@@ -2,7 +2,7 @@
 
 extern int a;
 
-main() {
+int main() {
   switch (a) {
   case 1:
     int v2 = 3;			// ERROR - referenced below
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/lex1.C b/gcc/testsuite/g++.old-deja/g++.jason/lex1.C
index 69fb0b7..174ec77 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/lex1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/lex1.C
@@ -1,4 +1,4 @@
-main()
+int main()
 {
   char c = '\351';
   if (c != '\351')
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/lineno5.C b/gcc/testsuite/g++.old-deja/g++.jason/lineno5.C
index f15aef0..95ff218 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/lineno5.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/lineno5.C
@@ -3,7 +3,7 @@
 // Bug: incomplete instantiation messes with lineno
 template <class T> class A;
 
-main()
+int main()
 {
   A<int> *p;
   undef1();// ERROR - 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/lvalue4.C b/gcc/testsuite/g++.old-deja/g++.jason/lvalue4.C
index f308213..79a02d8 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/lvalue4.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/lvalue4.C
@@ -1,4 +1,4 @@
-main() {
+int main() {
   int i = 2;
   int *pi = &(++i);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/mi.C b/gcc/testsuite/g++.old-deja/g++.jason/mi.C
index eaf59b2..de805dd 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/mi.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/mi.C
@@ -6,7 +6,7 @@ struct C : public A, public B { };
 struct D { virtual void baz () { } };
 struct E : public D, public C { void foo () { status = 0; } };
 
-main ()
+int main ()
 {
   E* ep = new E;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/mutable1.C b/gcc/testsuite/g++.old-deja/g++.jason/mutable1.C
index 9298d2e..5311a87 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/mutable1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/mutable1.C
@@ -4,7 +4,7 @@ struct X
   mutable int x;
 };
 
-main ()
+int main ()
 {
   const X x;
   x.x = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/new.C b/gcc/testsuite/g++.old-deja/g++.jason/new.C
index 89ec808..ce86569 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/new.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/new.C
@@ -13,7 +13,7 @@ void * operator new (size_t siz) throw (std::bad_alloc) {
   return malloc (siz);
 }
 
-main()
+int main()
 {
   s = 0;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/new5.C b/gcc/testsuite/g++.old-deja/g++.jason/new5.C
index 70f5ec5..87279fd 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/new5.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/new5.C
@@ -1,4 +1,4 @@
-main ()
+int main ()
 {
   const int *p = new const int (0);
   delete p;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/offset2.C b/gcc/testsuite/g++.old-deja/g++.jason/offset2.C
index 787e3f1..a598d43 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/offset2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/offset2.C
@@ -14,7 +14,7 @@ struct yy : public xx {
   yy(foo& a) { xx::a = a; }
 };
 
-main()
+int main()
 {
   foo f;
   yy y (f);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload11.C b/gcc/testsuite/g++.old-deja/g++.jason/overload11.C
index e8c043f..f5ed01e 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload11.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload11.C
@@ -7,7 +7,7 @@ public:
   void foo(int &i) { i = 1; }
 };
 
-main()
+int main()
 {
   A a;
   const A& b = a;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload12.C b/gcc/testsuite/g++.old-deja/g++.jason/overload12.C
index dc336c5..61d3740 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload12.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload12.C
@@ -9,7 +9,7 @@ struct B {
 B b_;
 const B &b () { return b_; }
 
-main()
+int main()
 {
   return b().foo();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload13.C b/gcc/testsuite/g++.old-deja/g++.jason/overload13.C
index 602dc2b..6b5ca0f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload13.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload13.C
@@ -19,7 +19,7 @@ void operator>>(xistream& i, int j)
   i.j = 0;
 }
 
-main() {
+int main() {
   int i;
   xifstream ifs;
   
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload16.C b/gcc/testsuite/g++.old-deja/g++.jason/overload16.C
index e1b7f3f..34237bc 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload16.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload16.C
@@ -1,6 +1,6 @@
 void f (int);			// ERROR - 
 void f (long);			// ERROR - 
-main()
+int main()
 {
   f (1 & 0xffffff00UL);		// ERROR - ambiguous
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload23.C b/gcc/testsuite/g++.old-deja/g++.jason/overload23.C
index 1cc1d0b..21cda3a 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload23.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload23.C
@@ -19,7 +19,7 @@ public:
 ostream& operator<< (ostream& os, const X& x);
 
 
-main()
+int main()
 {
   X x;
   ostream os;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload26.C b/gcc/testsuite/g++.old-deja/g++.jason/overload26.C
index 872b0b2..0c15668 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload26.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload26.C
@@ -11,7 +11,7 @@ struct A {
 } *a;
 
 void bing(const char *);
-main ()
+int main ()
 {
 	a->f(foo);		// gets bogus error because foo's size unknown.
 	a->f(baz);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload27.C b/gcc/testsuite/g++.old-deja/g++.jason/overload27.C
index 3ae1a1d..123018d 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload27.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload27.C
@@ -1,7 +1,7 @@
 void f(const int &) { }
 void f(const float &);
 
-main()
+int main()
 {
     f(false);			// gets bogus error
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/overload28.C b/gcc/testsuite/g++.old-deja/g++.jason/overload28.C
index e94e978..265c523 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/overload28.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/overload28.C
@@ -5,7 +5,7 @@ struct Foo {
   Foo(int i = 25) { }		// ERROR - candidate
 };
 
-main()
+int main()
 {
   Foo* f1 = new Foo();		// ERROR - ambiguous
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/parse10.C b/gcc/testsuite/g++.old-deja/g++.jason/parse10.C
index 477f7f5..b676336 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/parse10.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/parse10.C
@@ -2,7 +2,7 @@
 
 extern "C" int printf (const char *, ...);
 
-main()
+int main()
 {
   int j = 0, k = 0;
   1 ? j : k = 5;		// should be parsed 1 ? j : (k = 5)
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/parse12.C b/gcc/testsuite/g++.old-deja/g++.jason/parse12.C
index 7829a8b..eb71775 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/parse12.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/parse12.C
@@ -9,7 +9,7 @@ struct B {
   int f () { return (*p)(42); }	// gets bogus error
 };
 
-main ()
+int main ()
 {
   B b = { new A };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/parse9.C b/gcc/testsuite/g++.old-deja/g++.jason/parse9.C
index 62836e4..da66fea 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/parse9.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/parse9.C
@@ -9,7 +9,7 @@ public:
   void print() { }
 };
 
-main(int argc, char * argv[])
+int main(int argc, char * argv[])
 {
   int * i = &argc;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/pmem2.C b/gcc/testsuite/g++.old-deja/g++.jason/pmem2.C
index f8d9797..99adf1c 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/pmem2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/pmem2.C
@@ -33,7 +33,7 @@ struct myStruct
   int action() {return 0;};
 };
 
-main()
+int main()
 {
   myStruct toto;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/pmem3.C b/gcc/testsuite/g++.old-deja/g++.jason/pmem3.C
index 343953b..a780c23 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/pmem3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/pmem3.C
@@ -3,7 +3,7 @@
 
 struct A { int i; };
 struct B : public A { int j; int f (); };
-main ()
+int main ()
 {
   int A::*apm = &A::i;
   int B::*bpm = apm;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/pmf7.C b/gcc/testsuite/g++.old-deja/g++.jason/pmf7.C
index 303dfb9..8ef92fb 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/pmf7.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/pmf7.C
@@ -16,7 +16,7 @@ A& foo ()
   return a;
 }
 
-main ()
+int main ()
 {
   void (A::*p)() = &A::f;
   (foo ().*p)();
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/pmf8.C b/gcc/testsuite/g++.old-deja/g++.jason/pmf8.C
index 97f551e..7fccb31c 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/pmf8.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/pmf8.C
@@ -18,7 +18,7 @@ public:
 };
 
 
-main()
+int main()
 {
   User a;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/ref10.C b/gcc/testsuite/g++.old-deja/g++.jason/ref10.C
index faadb2e..876ca45 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/ref10.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/ref10.C
@@ -24,7 +24,7 @@ int bar(V *r) {
   return (r != gp);
 }
 
-main() {
+int main() {
   D *p = new D;
   foo(p);
   return bar(p);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/ref12.C b/gcc/testsuite/g++.old-deja/g++.jason/ref12.C
index 7a33647..30e9633 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/ref12.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/ref12.C
@@ -1,5 +1,5 @@
 void f (char *const &) { }
-main ()
+int main ()
 {
   f ("hi");
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/ref7.C b/gcc/testsuite/g++.old-deja/g++.jason/ref7.C
index ba7bd1d2..af64d6a 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/ref7.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/ref7.C
@@ -12,7 +12,7 @@ struct A {
 A a;
 A foo () { return a; }
 
-main()
+int main()
 {
   const A& ar = foo();
   const A& ar2 = A();
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/ref8.C b/gcc/testsuite/g++.old-deja/g++.jason/ref8.C
index 53f9c1c..10e335e 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/ref8.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/ref8.C
@@ -7,7 +7,7 @@ struct B {
 };
 struct C : public B, public A {};
 
-main() {
+int main() {
     C c;
 
     A& ar = c;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/return3.C b/gcc/testsuite/g++.old-deja/g++.jason/return3.C
index 61e3dda..ac52bc3 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/return3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/return3.C
@@ -12,7 +12,7 @@ A f()
   return b;
 }
 
-main ()
+int main ()
 {
   A a = f ();
   return a.i != 10;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/rvalue2.C b/gcc/testsuite/g++.old-deja/g++.jason/rvalue2.C
index 522c35f..71f59bc 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/rvalue2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/rvalue2.C
@@ -4,7 +4,7 @@ struct A {
   const A * get_this () const { return this; }
 };
 
-main ()
+int main ()
 {
   A a;
   int r = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/rvalue3.C b/gcc/testsuite/g++.old-deja/g++.jason/rvalue3.C
index 12fe76d..4e18cfb 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/rvalue3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/rvalue3.C
@@ -1,4 +1,4 @@
-main ()
+int main ()
 {
    int i;
    int &ir = (int&)(int)i;	// ERROR - casting rvalue to reference type
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/scoping17.C b/gcc/testsuite/g++.old-deja/g++.jason/scoping17.C
index a05acef..26fb456 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/scoping17.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/scoping17.C
@@ -1,6 +1,6 @@
 // Test that the integer hides the struct in block scope.
 
-main ()
+int main ()
 {
   int A;
   struct A { };
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/scoping4.C b/gcc/testsuite/g++.old-deja/g++.jason/scoping4.C
index 33f11a6..94a49bf 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/scoping4.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/scoping4.C
@@ -22,7 +22,7 @@ A::A(Ptr string) {		// gets bogus error -
   s = string;			// gets bogus error - 
 }
 
-main() {
+int main() {
   A a("testing");
   A *a_ptr;
   B b(&a);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/static1.C b/gcc/testsuite/g++.old-deja/g++.jason/static1.C
index 994da85..8c5bdff 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/static1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/static1.C
@@ -25,7 +25,7 @@ extern AAA arr1[];
 
 AAA arr1[] = {(int)E1 };
 
-main()
+int main()
 {
   return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/synth5.C b/gcc/testsuite/g++.old-deja/g++.jason/synth5.C
index cfc68c5..2905da7 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/synth5.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/synth5.C
@@ -11,4 +11,4 @@ struct A {
 struct B: public A {
 };
 #line 5 "synth5.C"
-main() { }
+int main() { }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/synth7.C b/gcc/testsuite/g++.old-deja/g++.jason/synth7.C
index 1d4264b..0595377 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/synth7.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/synth7.C
@@ -3,7 +3,7 @@
 struct B { ~B() { } };
 struct A { B b; };
 
-main()
+int main()
 {
   A a, b (a), c = A();
   A& (A::*afp)(const A&) = &A::operator=;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/tempdest.C b/gcc/testsuite/g++.old-deja/g++.jason/tempdest.C
index 78fb75d..04fae56 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/tempdest.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/tempdest.C
@@ -12,7 +12,7 @@ public:
 
 typedef unsigned int ui;
 
-main()
+int main()
 {
   A<ui> *ap = new A<ui>;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template11.C b/gcc/testsuite/g++.old-deja/g++.jason/template11.C
index 25449e2..d58bdfe 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template11.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template11.C
@@ -8,7 +8,7 @@ int foo () { return 1; }
 
 int A<int>::t = foo ();
 
-main ()
+int main ()
 {
   return (A<int>::t != 1);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template13.C b/gcc/testsuite/g++.old-deja/g++.jason/template13.C
index 75bd64d..fbd16a9 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template13.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template13.C
@@ -5,6 +5,6 @@
 template <class T> inline T min (T a, T b) { return a<b?a:b; }
 double min (double, double);
 
-main () {
+int main () {
   return (int) min (0, 1.0);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template14.C b/gcc/testsuite/g++.old-deja/g++.jason/template14.C
index 464638d..ecd99bc 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template14.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template14.C
@@ -10,7 +10,7 @@ template <class T> struct A {
 template <class T> A<T>::A(int) { } // causes compiler abort
 template <class T> A<T>::~A() { }
 
-main()
+int main()
 {
   A<int> a;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template15.C b/gcc/testsuite/g++.old-deja/g++.jason/template15.C
index 99e129b..9779ca0 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template15.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template15.C
@@ -12,7 +12,7 @@ public:
 
 class A { };
 
-main()
+int main()
 {
     int i;
     X<int> xi(i);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template19.C b/gcc/testsuite/g++.old-deja/g++.jason/template19.C
index ab34443..68ea9a9 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template19.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template19.C
@@ -1,7 +1,7 @@
 // Make sure type deduction isn't confused by top-level cv-quals.
 template <class T> T max (const T a, const T b)  { return a>b?a:b; }
 
-main()
+int main()
 {
   int a = 0, b = 1;
   int c = max (a, b);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template20.C b/gcc/testsuite/g++.old-deja/g++.jason/template20.C
index fe776c9..ee4daa0 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template20.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template20.C
@@ -1,7 +1,7 @@
 // Make sure type deduction works for both types of array parameters.
 template <class T> void f (T (&a)[2]) { }
 template <class T> void g (T a[2]) { }
-main()
+int main()
 {
   int a[2] = { 0, 0 };
   f (a);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template22.C b/gcc/testsuite/g++.old-deja/g++.jason/template22.C
index db2c620..ce247e8 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template22.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template22.C
@@ -19,7 +19,7 @@ template <class T> void g1 (const T&);
 template <class T> void g2 (T&);
 template <class T> void g3 (T);
 
-main()
+int main()
 {
   g1 (f1 ());
   g1 (f2 ());
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template24.C b/gcc/testsuite/g++.old-deja/g++.jason/template24.C
index c56d92a..120b717 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template24.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template24.C
@@ -14,7 +14,7 @@ ostream & operator<< (ostream & os, A<T> & a)
   return os;
 }
 
-main ()
+int main ()
 {
   A<int> a = { 1 };
   cout << a << endl;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template25.C b/gcc/testsuite/g++.old-deja/g++.jason/template25.C
index 4fc2a99..970441226 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template25.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template25.C
@@ -34,7 +34,7 @@ do_foo (Bar<T, T> const & bar)
 {}
 
 
-main ()
+int main ()
 { int i;
   Bar<char, int> bar1;
   Bar<int, int>  bar2;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template27.C b/gcc/testsuite/g++.old-deja/g++.jason/template27.C
index 3806da0..be90aca 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template27.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template27.C
@@ -28,16 +28,16 @@ void Test<T>::doThat()
 class A 
 { 
  public: 
-  thiss() {}; 
+  void thiss() {}; 
 };
 
 class B
 { 
  public: 
-  that() {}; 
+  void that() {}; 
 };
 
-main() 
+int main() 
 { 
   Test<A> a; 
   a.doThiss();			// a.doThat() is not well formed, but then
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template3.C b/gcc/testsuite/g++.old-deja/g++.jason/template3.C
index e03b8a9..1cd6553 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template3.C
@@ -7,7 +7,7 @@ A<int> *a;
 
 template <class T> struct A { T t; };
 
-main()
+int main()
 {
   if (a)
     a->t = 1;			// gets bogus error
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template30.C b/gcc/testsuite/g++.old-deja/g++.jason/template30.C
index b9a6dbe..98bad49 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template30.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template30.C
@@ -7,7 +7,7 @@ int func(T, U)
         return 2;
 }
 
-main ()
+int main ()
 {
   func (0, 1);			// ERROR - ambiguous
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template31.C b/gcc/testsuite/g++.old-deja/g++.jason/template31.C
index fdea9d6..1148e27 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template31.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template31.C
@@ -30,7 +30,7 @@ private:
     CopyMe myStrvec;
 };
 
-main(int argc, char**argv)   {
+int main(int argc, char**argv)   {
     IncludeIt foo;
     IncludeIt* bar;
     exit(0);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template34.C b/gcc/testsuite/g++.old-deja/g++.jason/template34.C
index 7694329..177286f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template34.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template34.C
@@ -19,6 +19,6 @@ Set<T>::Compare Set<T>::cmp1 = &gen_cmp;
 template<class T>
 int (*Set<T>::cmp2)(const T&, const T&) = &gen_cmp;
 
-main() {
+int main() {
     Set<int> s;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template37.C b/gcc/testsuite/g++.old-deja/g++.jason/template37.C
index fc237ca..71aa270 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template37.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template37.C
@@ -27,7 +27,7 @@
   {
   }
 
-  main()
+int main()
   {
     ONE<char>::func();
     ONE<int>::func();
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template40.C b/gcc/testsuite/g++.old-deja/g++.jason/template40.C
index 635dffc..a880392 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template40.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template40.C
@@ -13,7 +13,7 @@ private:
   int size;
 };
 
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
   Array<long> ia;	// looping occurs on this line
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template42.C b/gcc/testsuite/g++.old-deja/g++.jason/template42.C
index 529aacc..2bd6267 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template42.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template42.C
@@ -10,7 +10,7 @@ struct A {
   void f (T t = T()) { }
 };
 
-main ()
+int main ()
 {
   A<X> a;
   X x (1);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template43.C b/gcc/testsuite/g++.old-deja/g++.jason/template43.C
index 62c7ee7..d9b3f85 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template43.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template43.C
@@ -19,7 +19,7 @@ int equals_x_y = EQUAL<&x,&y>::value; // expected value: 0
 int equals_y_x = EQUAL<&y,&x>::value; // expected value: 0
 int equals_y_y = EQUAL<&y,&y>::value; // expected value: 1
 
-main ()
+int main ()
 {
   if (equals_x_x == 1
       && equals_x_y == 0
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/temporary2.C b/gcc/testsuite/g++.old-deja/g++.jason/temporary2.C
index ea80a3f..36c8e8e 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/temporary2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/temporary2.C
@@ -9,7 +9,7 @@ public:
 
 X foo() { X x; return x; }
 
-main() 
+int main() 
 {
   X   x(foo()); // ERROR - Compiler doesn't warn about temporary reference.
   x.bar(foo()); // ERROR - The same mistake is warned about in this case.
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/temporary3.C b/gcc/testsuite/g++.old-deja/g++.jason/temporary3.C
index ec5984c..3ffeec7 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/temporary3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/temporary3.C
@@ -15,7 +15,7 @@ struct A {
 A f ()
 { return 1; }
 
-main ()
+int main ()
 {
   {
     A a (1);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/temporary4.C b/gcc/testsuite/g++.old-deja/g++.jason/temporary4.C
index 97ce95a..bb7e56f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/temporary4.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/temporary4.C
@@ -24,7 +24,7 @@ struct B {
   B(): i(foo()), j(foo()) { }
 };
 
-main()
+int main()
 {
   B b;
   return r;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/temporary5.C b/gcc/testsuite/g++.old-deja/g++.jason/temporary5.C
index 07033d0..6a2469e 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/temporary5.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/temporary5.C
@@ -9,7 +9,7 @@ struct A {
   operator int () { return 1; }
 };
 
-main ()
+int main ()
 {
   A::A();
   return c;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/typeid1.C b/gcc/testsuite/g++.old-deja/g++.jason/typeid1.C
index f7fcbae..f6cd45b 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/typeid1.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/typeid1.C
@@ -3,7 +3,7 @@
 
 struct foo { double f(int); };
 
-main() {
+int main() {
   double f (int);
   const std::type_info &r = typeid (f);
   cout << typeid(f).name() << endl;
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/typeid2.C b/gcc/testsuite/g++.old-deja/g++.jason/typeid2.C
index 16d5e97..64ecc5a 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/typeid2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/typeid2.C
@@ -21,7 +21,7 @@ public:
   }
 };
 
-main()
+int main()
 {
   Flock<Chicken> x;
   printf ("%s\n", typeid(x).name());
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/virtual.C b/gcc/testsuite/g++.old-deja/g++.jason/virtual.C
index 65e8c94..3fa952b 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/virtual.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/virtual.C
@@ -35,7 +35,7 @@ public:
   virtual void b1() {};
 };
 
-main()
+int main()
 {
   D d;				// gets bogus error
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/virtual2.C b/gcc/testsuite/g++.old-deja/g++.jason/virtual2.C
index 22b9fec..ef42f8b 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/virtual2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/virtual2.C
@@ -6,7 +6,7 @@ struct B: public A {
   virtual B* f () { return 0; }
 };
 
-main ()
+int main ()
 {
   A* ap = new B;
   return (ap->f () != 0);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/warning2.C b/gcc/testsuite/g++.old-deja/g++.jason/warning2.C
index 778a615..6b51dd0 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/warning2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/warning2.C
@@ -7,7 +7,7 @@ struct A {
 
 struct B: public A { int f () { } };
 
-main()
+int main()
 {
   B* bp;
   A& ar = (A&)bp;		// WARNING - 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/access2.C b/gcc/testsuite/g++.old-deja/g++.law/access2.C
index 02b27c3..22f9184 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/access2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/access2.C
@@ -14,7 +14,7 @@ private:
 };
 
 
-main()
+int main()
 {
     Foo<int>(1);// ERROR - 
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arg1.C b/gcc/testsuite/g++.old-deja/g++.law/arg1.C
index f980874..1712f93 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arg1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arg1.C
@@ -19,7 +19,7 @@ public:
       void f(double* p) { cout << "B(double*)\n"; } // ERROR - candidate
 };
 
-main()
+int main()
 {
     A a;
     B b;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arg3.C b/gcc/testsuite/g++.old-deja/g++.law/arg3.C
index 0037c40..c984d3a 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arg3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arg3.C
@@ -11,7 +11,7 @@ template <class T> void func(T, const Ptr& p);
 Ptr& return_ref();
 
 
-main()
+int main()
 {
   char* x;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arg7.C b/gcc/testsuite/g++.old-deja/g++.law/arg7.C
index 5cf1cd0..7ea89ec 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arg7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arg7.C
@@ -22,7 +22,7 @@ void ovf(          int, short, unsigned long) { printf ("FAIL\n"); }
 // (unsigned long => int, unsigned int => short) and a promotion
 // (unsigned int => unsigned long).
 
-main(int, char**)
+int main(int, char**)
 {
     unsigned long pixmap = 0;
     unsigned int x = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arg9.C b/gcc/testsuite/g++.old-deja/g++.law/arg9.C
index 809f2b7..6f5e4b8 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arg9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arg9.C
@@ -25,7 +25,7 @@ public:
 private:
 };
 
-main() {
+int main() {
 
 int t[5];
 t[1] = 1; t[2] = 2;t[3] = 3;t[4] = 4;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm13.C b/gcc/testsuite/g++.old-deja/g++.law/arm13.C
index f6a10fa..cf62278 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm13.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm13.C
@@ -4,7 +4,7 @@
 
 inline void *operator new(size_t, void *place) { return place; }
 
-main()
+int main()
 {
   int* p = (int*) malloc(sizeof(int));
   (void) new (p) int(1);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm9.C b/gcc/testsuite/g++.old-deja/g++.law/arm9.C
index 528478f..35658b1 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm9.C
@@ -21,7 +21,7 @@ public:
 };
 void B::set (f2 f) { cout << "called B\n";} // ERROR - candidate
 
-main() {
+int main() {
     B b;
     b.set(F1); // ARM page 309: should call A.set(f1) and that what g++ does,// ERROR - .*
                // but 13.1 of ARM clearly states that it should call B::set()
diff --git a/gcc/testsuite/g++.old-deja/g++.law/array1.C b/gcc/testsuite/g++.old-deja/g++.law/array1.C
index fc40bc5..13250c6 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/array1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/array1.C
@@ -22,7 +22,7 @@ public:
 
 foo* foo::array = new foo [5];
 
-main()
+int main()
 {
   if (i != 5)
     printf ("FAIL\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.law/bad-error7.C b/gcc/testsuite/g++.old-deja/g++.law/bad-error7.C
index 479dbf5..434921d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/bad-error7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/bad-error7.C
@@ -14,7 +14,7 @@ class X : public ParX
                 void fn2() { cout << "hi" << endl; }
         };
 
-main()
+int main()
         {
         X               x;
         ParX*   pParX                   = &x;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/code-gen1.C b/gcc/testsuite/g++.old-deja/g++.law/code-gen1.C
index b122e90..0f7c610 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/code-gen1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/code-gen1.C
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 
-main()
+int main()
 {
   int i = 0;
   (++i)++;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/code-gen4.C b/gcc/testsuite/g++.old-deja/g++.law/code-gen4.C
index a9070ed..c060d66 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/code-gen4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/code-gen4.C
@@ -18,7 +18,7 @@ A oA;
 
 extern "C" int printf( const char *, ...);
 
-main()
+int main()
 {
         oA.c = 'q';
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/code-gen5.C b/gcc/testsuite/g++.old-deja/g++.law/code-gen5.C
index fa55dbe..023b623 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/code-gen5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/code-gen5.C
@@ -261,7 +261,7 @@ operator=( double d )
 
 int makeforms( Vector cen, Vector **a, Vector **b );
 
-main()
+int main()
 {
 	Vector *a[8], *b[8], disp(3);
 	Vector cen(3), cen2(3);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/copy1.C b/gcc/testsuite/g++.old-deja/g++.law/copy1.C
index cd23706..5cea11a 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/copy1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/copy1.C
@@ -54,7 +54,7 @@ test(person argp)
   ;
 }
 
-main()
+int main()
 {
   person mainp;
   test(mainp);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors11.C b/gcc/testsuite/g++.old-deja/g++.law/ctors11.C
index 8472fb8..3c39356 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors11.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors11.C
@@ -15,7 +15,7 @@ private:
 public:
 }; // ERROR - non-default constructor
 
-main()
+int main()
 {
   B(10);// ERROR - B doesn't have a constructor taking int
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors12.C b/gcc/testsuite/g++.old-deja/g++.law/ctors12.C
index 37d45884..32bf5c6 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors12.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors12.C
@@ -21,7 +21,7 @@ public:
 
 int complex::count=0;
 
-main()
+int main()
 {
         complex v[6] = {1, complex(1,2), complex(), 2 }; // ARM Sect. 12.6.1
         int i;                                           // page 289
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors13.C b/gcc/testsuite/g++.old-deja/g++.law/ctors13.C
index 57639cc..aef721b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors13.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors13.C
@@ -6,7 +6,7 @@ class A {
    A() {}    // private constructor// ERROR - .*
 };
 
-main() {
+int main() {
   A* a = new A();// ERROR - .*
   if (a) {
      cout << "a != NULL\n";
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors16.C b/gcc/testsuite/g++.old-deja/g++.law/ctors16.C
index 4da7f05..8a3982b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors16.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors16.C
@@ -38,7 +38,7 @@ public:
 };
 
 
-main() {
+int main() {
     C c;
     D d;
     E e;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors17.C b/gcc/testsuite/g++.old-deja/g++.law/ctors17.C
index 41e3217..eab071c 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors17.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors17.C
@@ -13,7 +13,7 @@ class X : public ifstream {
     public:
       X(int a, char *b) {} // ERROR - candidate
 }; // ERROR - candidate
-main()
+int main()
 {
     X *y = new X(10, "123");
     // the compiler must reject this constructor call:
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors2.C b/gcc/testsuite/g++.old-deja/g++.law/ctors2.C
index 8ceb539..d4f2d9c 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors2.C
@@ -56,7 +56,7 @@ CONST Sig::SigTable Sig::sigTable[] = {
   { Bad_t, BadMagic }
 };
 
-main() {
+int main() {
   if (strcmp (Sig::sigTable[0].Magic, "BYTE")
       || strcmp (Sig::sigTable[1].Magic, "WORD")
       || strcmp (Sig::sigTable[2].Magic, "LONG")
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors8.C b/gcc/testsuite/g++.old-deja/g++.law/ctors8.C
index f773d09..ef40d35 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors8.C
@@ -14,7 +14,7 @@ struct foo {
 
 foo *arr = new foo[2];
 
-main()
+int main()
 {
   if (arr[0].index == -1
       && arr[1].index == -1)
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors9.C b/gcc/testsuite/g++.old-deja/g++.law/ctors9.C
index 280b429..d926e64 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors9.C
@@ -30,7 +30,7 @@ int blort(Foo& f)
   return f->a;
 };
 
-main()
+int main()
 {
   var_Foo b(2);// ERROR - 
   b->a = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt1.C b/gcc/testsuite/g++.old-deja/g++.law/cvt1.C
index 8264124..3f0866e 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt1.C
@@ -6,7 +6,7 @@
 // Subject:  g++ mixes up array dimensions with new
 // Message-ID: <9311211640.AA11787@messua>
 
-main()
+int main()
 {
         int (*a)[5] = new int[6][5];
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt10.C b/gcc/testsuite/g++.old-deja/g++.law/cvt10.C
index 01f1e80..c943a39 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt10.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt10.C
@@ -51,7 +51,7 @@ public:
 };
 
 
-main()
+int main()
 {
   C *cp= new C;
   cp->va();
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt11.C b/gcc/testsuite/g++.old-deja/g++.law/cvt11.C
index 321368c..7394c1b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt11.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt11.C
@@ -26,5 +26,5 @@ void Bar::doit(void)
   printf("i = %d\n", j);
 }
 Thing::Thing(int y) { x = y; }
-main(){ Bar x; x.doit(); }
+int main(){ Bar x; x.doit(); }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt12.C b/gcc/testsuite/g++.old-deja/g++.law/cvt12.C
index cce2d9b..5ea83db 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt12.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt12.C
@@ -17,7 +17,7 @@ public:
    int& geti()            {return i;} // same thing, but different
 };
 
-main()
+int main()
 {
    test t(3.14, 5);  // Create an object t of class "test"
    int x = (int&)t;  // This should call operator int&() but it does not ...
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt13.C b/gcc/testsuite/g++.old-deja/g++.law/cvt13.C
index d2f04cc..c7b09e9 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt13.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt13.C
@@ -12,7 +12,7 @@ void f(array &arg)
 {
 }
 
-main()
+int main()
 {
     array var;
     f(var);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt14.C b/gcc/testsuite/g++.old-deja/g++.law/cvt14.C
index 2cf0235..e2b9bad 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt14.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt14.C
@@ -7,7 +7,7 @@
 // From: "Malcolm C. Strickland" <chucks@orl.mmc.com>
 
 
-        main()
+int main()
         {
           double *d;
           d = new double(10);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt17.C b/gcc/testsuite/g++.old-deja/g++.law/cvt17.C
index 6ddffe2..b746c98 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt17.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt17.C
@@ -12,7 +12,7 @@ class Point {};
 class Line_Segment{ public: Line_Segment(const Point&){} };
 class Node { public: Point Location(){ Point p; return p; } };
 
-main()
+int main()
 {
    Node** node1;
    Line_Segment(node1->Location()); // intended (*node1)// ERROR - .*
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt19.C b/gcc/testsuite/g++.old-deja/g++.law/cvt19.C
index b15bdfd..ae07a38 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt19.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt19.C
@@ -18,7 +18,7 @@ class A {
 };
 
 
-main()
+int main()
 {
     A a;
     if (a!=0) {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt2.C b/gcc/testsuite/g++.old-deja/g++.law/cvt2.C
index 3a5a1b9..4c28a7e 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt2.C
@@ -35,7 +35,7 @@ A(const char* s)
 	  printf ("PASS\n");
 }
 
-main()
+int main()
 {
         A(B("aaa"));
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt20.C b/gcc/testsuite/g++.old-deja/g++.law/cvt20.C
index 72abbb7..1ecbfa2 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt20.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt20.C
@@ -14,7 +14,7 @@ void f(char *& x)
   x++;
 }
 
-main()
+int main()
 {
   f ("foo");// ERROR - init of non-const ref from char*
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt21.C b/gcc/testsuite/g++.old-deja/g++.law/cvt21.C
index c4516c8..8cdd150 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt21.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt21.C
@@ -24,7 +24,7 @@ class Int
 		int value;
 };
  
-main()
+int main()
 {
   Int data = 2;
   Int test;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt22.C b/gcc/testsuite/g++.old-deja/g++.law/cvt22.C
index 9d72a6c..c9a80ba 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt22.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt22.C
@@ -8,7 +8,7 @@
 
 typedef int A[10];
 
-main()
+int main()
 {
    int* a1 = new A;
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt4.C b/gcc/testsuite/g++.old-deja/g++.law/cvt4.C
index 6863c8f..d45d789 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt4.C
@@ -18,7 +18,7 @@ int destruct = 2;
      ~Test() {if (--destruct == 0) printf ("PASS\n");}
   };
 
-  main()
+int main()
   {
      long i=1;
      Test t;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt5.C b/gcc/testsuite/g++.old-deja/g++.law/cvt5.C
index d244b4f..a7a0470 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt5.C
@@ -19,7 +19,7 @@ public:
 
 void f(A&) {}
 
-main(){
+int main(){
   R r;
 
   f(r); // problem to cast to B& and then to A&
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt6.C b/gcc/testsuite/g++.old-deja/g++.law/cvt6.C
index 85d5af8..fd0a83e 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt6.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt6.C
@@ -22,7 +22,7 @@ public:
 };
 
 
-main() {
+int main() {
   foo f;
   f.test(34);  // line 18
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt7.C b/gcc/testsuite/g++.old-deja/g++.law/cvt7.C
index 34cccd84..c9cc1b5 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt7.C
@@ -46,7 +46,7 @@ B::run()
     }
 }
 
-main()
+int main()
 {
     A a(1);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/cvt8.C b/gcc/testsuite/g++.old-deja/g++.law/cvt8.C
index 031e766..f97790a 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/cvt8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/cvt8.C
@@ -28,7 +28,7 @@ void f(A &a) { // ERROR - in passing argument
         printf("A at %x is %d\n", &a, a.i);
 }
 
-main() {
+int main() {
         B b;
         b.i = 99;
         f(b);// ERROR - .*
diff --git a/gcc/testsuite/g++.old-deja/g++.law/dtors2.C b/gcc/testsuite/g++.old-deja/g++.law/dtors2.C
index c1f2d42..ebf9612 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/dtors2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/dtors2.C
@@ -25,7 +25,7 @@ public:
              //         passed as value)
 };
 
-main() {
+int main() {
 
         ulk dumm;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/dtors3.C b/gcc/testsuite/g++.old-deja/g++.law/dtors3.C
index ce5aaf3..7ed92fc 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/dtors3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/dtors3.C
@@ -29,7 +29,7 @@ public:
   }
 };
 
-main()
+int main()
 {
   Foo() << 1 << 3 << 5 << 7;
   printf ("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.law/dtors4.C b/gcc/testsuite/g++.old-deja/g++.law/dtors4.C
index 0288395..6168c0d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/dtors4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/dtors4.C
@@ -14,7 +14,7 @@ a       test(){
         return a();
 }
 
-main(){
+int main(){
         a       ai;
 
         ai = test();
diff --git a/gcc/testsuite/g++.old-deja/g++.law/dtors5.C b/gcc/testsuite/g++.old-deja/g++.law/dtors5.C
index 9aa2e6d..3c54561 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/dtors5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/dtors5.C
@@ -24,7 +24,7 @@ sub(foo f) {
 };
 
 
-main() {
+int main() {
    sub(foo());
    if (things == 0)
      printf ("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.law/enum3.C b/gcc/testsuite/g++.old-deja/g++.law/enum3.C
index c7db587..43845e2 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/enum3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/enum3.C
@@ -16,6 +16,6 @@ public:
   virtual void off(void) { toggle = on; };// ERROR - .*
 };
 
-main()
+int main()
 {
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/except6.C b/gcc/testsuite/g++.old-deja/g++.law/except6.C
index da09ae6..cca167c 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/except6.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/except6.C
@@ -13,7 +13,7 @@ struct Exception
      Exception(int i) { v = i; };
  };
 
- inc(int &i)
+void inc(int &i)
  {
      try {
          if (i == 0)
diff --git a/gcc/testsuite/g++.old-deja/g++.law/global-init1.C b/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
index ce64125..17dc9c5 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/global-init1.C
@@ -10,7 +10,7 @@ struct S { int  a; int  c; };
 int i = 3;
 S s = {6, i};
 S * the_s  () { return &s; };
-main ()
+int main ()
 {
   S * cls = the_s ();
   if (cls->a != 6)
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init11.C b/gcc/testsuite/g++.old-deja/g++.law/init11.C
index d5c4e76..a6d6f01 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init11.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init11.C
@@ -15,7 +15,7 @@ struct foo {
 
 struct foo Ack = {5, X, 3};
 
-main()
+int main()
 {
   if (Ack.a == 5 && Ack.b == 7 && Ack.c == 3)
     printf ("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init14.C b/gcc/testsuite/g++.old-deja/g++.law/init14.C
index a65dc68..3a9e3e1 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init14.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init14.C
@@ -15,7 +15,7 @@ struct foo {
 
 struct foo Ack = {5, X, 3};
 
-main()
+int main()
 {
     if (Ack.a != 5
 	|| Ack.b != 7
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init3.C b/gcc/testsuite/g++.old-deja/g++.law/init3.C
index de0473e..72b9de8 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init3.C
@@ -6,7 +6,7 @@
 // Subject:  small bug
 // Message-ID: <9209300638.AA22334@moose.cs.columbia.edu>
 
-main() {
+int main() {
 int offset;
 char buf[offset]=""; // ERROR - ansi forbids variable arrays
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/init9.C b/gcc/testsuite/g++.old-deja/g++.law/init9.C
index baad139..d6cec1b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/init9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/init9.C
@@ -14,7 +14,7 @@ public:
         int get_a() { return a; }
 };
 
-main() {
+int main() {
         samp ob[4] [2] = {  // Generated Error
                 1, 2,
                 3, 4,
diff --git a/gcc/testsuite/g++.old-deja/g++.law/inline4.C b/gcc/testsuite/g++.old-deja/g++.law/inline4.C
index c6a15a9..e7c664c 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/inline4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/inline4.C
@@ -12,7 +12,7 @@ template <class T> inline T func(const T& x) { return x; }
 inline int func(const int& x) { return x; }
 
 
-main()
+int main()
 { int x;
   func(x);
   printf ("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C b/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
index 4589bb1..18a026d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/missed-error2.C
@@ -11,7 +11,7 @@
 inline int max(int a, int b) {return a > b ? a : b;}; // ERROR - candidate
 inline double max(double a, double b) {return a > b ? a : b;}; // ERROR - candidate
 
-main() {
+int main() {
    static void foo(int i, int j, double x, double y) ;// ERROR - .*
 
    foo(4, -37, 14.39, 14.38);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/nest3.C b/gcc/testsuite/g++.old-deja/g++.law/nest3.C
index 405a160..eac308e 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/nest3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/nest3.C
@@ -18,7 +18,7 @@ struct outer {
   }
 };
 
-main() {
+int main() {
   outer::f();
   cout << endl;
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/nest4.C b/gcc/testsuite/g++.old-deja/g++.law/nest4.C
index 183442d..98b085f 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/nest4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/nest4.C
@@ -15,6 +15,6 @@ void f()
   };
 }
 
-main()
+int main()
 {
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators1.C b/gcc/testsuite/g++.old-deja/g++.law/operators1.C
index fa4c10c..138fb72 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators1.C
@@ -16,7 +16,7 @@ public:
     operator B & () { return *p; }
 };
 
-main()
+int main()
 {
     A a;
     B &b = (B &)a;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators10.C b/gcc/testsuite/g++.old-deja/g++.law/operators10.C
index fe4f13d..c87880f 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators10.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators10.C
@@ -13,7 +13,7 @@ struct Test {
 };
 
 
-main()
+int main()
 {
     Test<int> i, j;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators13.C b/gcc/testsuite/g++.old-deja/g++.law/operators13.C
index 3675d50..f423238 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators13.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators13.C
@@ -17,7 +17,7 @@ public:
 
 void EP::operator=(T *) { }
 
-main()
+int main()
 {
   EP ep1, ep2;
   ep1 = ep2;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators14.C b/gcc/testsuite/g++.old-deja/g++.law/operators14.C
index 191266f..22e1256 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators14.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators14.C
@@ -2,7 +2,7 @@
 // GROUPS passed operators
 void foo (int * a, int * b, int * c) {}
 
-main() {
+int main() {
 	int a,b,c;
 	foo (&a, &b, &c);
 	(a = b) = c;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators16.C b/gcc/testsuite/g++.old-deja/g++.law/operators16.C
index 384c4e9..3298e309 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators16.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators16.C
@@ -19,7 +19,7 @@ struct B {
         A a;
 };
 
-main(void)
+int main(void)
 {
         B(A());
 	if (pass)
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators21.C b/gcc/testsuite/g++.old-deja/g++.law/operators21.C
index c1f8b8b..a4aac7d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators21.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators21.C
@@ -9,7 +9,7 @@ int operator()(A x,float y) {// ERROR - .*
         return 1;
 }
 
-main() {
+int main() {
         A x;
         x(1.0); // ERROR - no match
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators28.C b/gcc/testsuite/g++.old-deja/g++.law/operators28.C
index c0d1ecd..3600fb2 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators28.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators28.C
@@ -21,7 +21,7 @@ void* new_test::operator new(size_t sz, int count, int type)
   return p;
 };
 
-main()
+int main()
 {
   new_test *test;
   int count = 13;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators30.C b/gcc/testsuite/g++.old-deja/g++.law/operators30.C
index 3c23a06..4236dc5 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators30.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators30.C
@@ -7,11 +7,11 @@
 
 #include <stdio.h>
 
-nop()
+void nop()
 {
-} // ERROR - non-void
+}
 
-main ()
+int main ()
 {
         int a = 2;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators32.C b/gcc/testsuite/g++.old-deja/g++.law/operators32.C
index bb6f8c9..26e4398 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators32.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators32.C
@@ -37,7 +37,7 @@ if( allocate1d(d1, array) != 0 )
 return array;
 }
 
-main()
+int main()
 {
 long d1 = 3, d2 = 4;
 class foo
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators4.C b/gcc/testsuite/g++.old-deja/g++.law/operators4.C
index e5df81d..044249f 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators4.C
@@ -22,7 +22,7 @@ void foo(int s)
   Vector junk(s);
 }
 
-main()
+int main()
 {
   Vector* test;
   for (int i=0;i<40;i++) // was 100000
diff --git a/gcc/testsuite/g++.old-deja/g++.law/operators8.C b/gcc/testsuite/g++.old-deja/g++.law/operators8.C
index 0b59d3c..5fd94bd 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/operators8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/operators8.C
@@ -40,7 +40,7 @@ class triangle :public shape {
     int height;
 };
 
-main() {
+int main() {
     shape* s1 = new square(4,4,5);
     shape* s2 = new triangle(6,6,2,3);
     *s1 = *s2;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/parsing6.C b/gcc/testsuite/g++.old-deja/g++.law/parsing6.C
index 7fcc13c..63a660e 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/parsing6.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/parsing6.C
@@ -8,7 +8,7 @@
 
 typedef  int (*cow[3])(...);
 
-main() {
+int main() {
   cow fs;
   int (*pig[3])(...); // line 5
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/parsing8.C b/gcc/testsuite/g++.old-deja/g++.law/parsing8.C
index 9a714a3..d897849 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/parsing8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/parsing8.C
@@ -17,7 +17,7 @@
 // Date:     Thu, 08 Jul 1993 10:54:59 +0900
 // Subject:  g++ cannot understand `void (**f)()'
 // Message-ID: <9307080155.AA00496@kumade.soft.flab.fujitsu.co.jp>
-main()
+int main()
 {
         void (**f)();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/parsing9.C b/gcc/testsuite/g++.old-deja/g++.law/parsing9.C
index 13138ed..0cd22fd 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/parsing9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/parsing9.C
@@ -21,7 +21,7 @@ T bar()
 T baz()
 { return 30; }
 
-main()
+int main()
 {
 T (*apfrt[10])();
 
diff --git a/gcc/testsuite/g++.old-deja/g++.law/patches1.C b/gcc/testsuite/g++.old-deja/g++.law/patches1.C
index e151a33..3ec9321 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/patches1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/patches1.C
@@ -12,7 +12,7 @@ int type(long double) { return 3; }
 
 extern "C" int printf( const char *, ...);
 
-main()
+int main()
 {
       int i = 0;
       if (type(0.0) != 2)
diff --git a/gcc/testsuite/g++.old-deja/g++.law/refs1.C b/gcc/testsuite/g++.old-deja/g++.law/refs1.C
index f0b7f11..0efe9db 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/refs1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/refs1.C
@@ -31,7 +31,7 @@ void C::count (int& total) {
 char * foo[] = {
    "one", "two", "three", NULL};
 
-main() {
+int main() {
    C c(foo);
    int i = 0;
    c.count(i);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/refs4.C b/gcc/testsuite/g++.old-deja/g++.law/refs4.C
index a73c078..40e199a 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/refs4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/refs4.C
@@ -14,7 +14,7 @@ void foo(const int m, const int n)
 	  printf("FAIL\n");
 }
 
-main()
+int main()
 {
         foo(min(2, 1), min(100, 200));
         return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/scope2.C b/gcc/testsuite/g++.old-deja/g++.law/scope2.C
index f8b9052..bfefb61 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/scope2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/scope2.C
@@ -31,7 +31,7 @@ void foo::operator delete (void *data)
   overloaded_delete++;
 }
 
-main ()
+int main ()
 {
   foo *f = new foo;
   foo *ff = ::new foo;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/scope5.C b/gcc/testsuite/g++.old-deja/g++.law/scope5.C
index 2aea15b..d7bcb63 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/scope5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/scope5.C
@@ -6,7 +6,7 @@
 // Subject:  Bug report
 // Message-ID: <9308101450.AA28016@methusalix.ert.rwth-aachen.de>
 
-main()
+int main()
 {
         class foo
         {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/static-mem4.C b/gcc/testsuite/g++.old-deja/g++.law/static-mem4.C
index 4e02647..09e1637 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/static-mem4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/static-mem4.C
@@ -7,7 +7,7 @@ struct test {
 };
 
 
-main()
+int main()
 {
   test t;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/template1.C b/gcc/testsuite/g++.old-deja/g++.law/template1.C
index 809e509..bde1537 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/template1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/template1.C
@@ -25,6 +25,6 @@ public:
         int fill;
 };
 
-main() {
+int main() {
         Assoc<String,String> table;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/temps2.C b/gcc/testsuite/g++.old-deja/g++.law/temps2.C
index d968481..4e21672 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/temps2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/temps2.C
@@ -42,7 +42,7 @@ Foo &Foo::method()
     return *this;
 }
 
-main()
+int main()
 {
     // f1() returns a temporary object. The member function
     // method() returns a reference to the same object.
diff --git a/gcc/testsuite/g++.old-deja/g++.law/temps3.C b/gcc/testsuite/g++.old-deja/g++.law/temps3.C
index 7b09284..48e4498 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/temps3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/temps3.C
@@ -21,7 +21,7 @@ foo ()
         return A (10);
 }
 
-main ()
+int main ()
 {
         int x = foo ().a;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/temps6.C b/gcc/testsuite/g++.old-deja/g++.law/temps6.C
index e228ce8..7d2952a 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/temps6.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/temps6.C
@@ -14,7 +14,7 @@ int& test(str *arg1, int str::*arg2)
   return (arg1->*arg2);
 }
 
-main()
+int main()
 {
   test(&xxx, &str::i) = 5;
   if (xxx.i == 0)
diff --git a/gcc/testsuite/g++.old-deja/g++.law/typeck1.C b/gcc/testsuite/g++.old-deja/g++.law/typeck1.C
index 2fabfe9..f0ee773 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/typeck1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/typeck1.C
@@ -11,7 +11,7 @@
         class foo : a { };
         class bar : a { };
 
-        test( const foo* f, const bar* b )
+        int test( const foo* f, const bar* b )
                 {
                 return f == b;// ERROR - 
                 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/typeck2.C b/gcc/testsuite/g++.old-deja/g++.law/typeck2.C
index 485a929..24f3cb1 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/typeck2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/typeck2.C
@@ -7,7 +7,7 @@
 // Message-ID: <199306091558.AA19075@mail.cs.tu-berlin.de>
 
   typedef int arr[10];
-  main()
+int main()
   {
         int * p = new int[10];
         int * q = new arr;              /* g++ complains, but shouldn't     */
diff --git a/gcc/testsuite/g++.old-deja/g++.law/union1.C b/gcc/testsuite/g++.old-deja/g++.law/union1.C
index 71246a4..ce7c3d7 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/union1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/union1.C
@@ -24,6 +24,6 @@ op_to_charp BINOPS[] = { {"+", PLUS},
                          {"/", DIV},
                          {"^", POWR} };
 
-main() {
+int main() {
   int dummy;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/unsorted2.C b/gcc/testsuite/g++.old-deja/g++.law/unsorted2.C
index 3b81431..b3c13a4 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/unsorted2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/unsorted2.C
@@ -17,7 +17,7 @@ X<A,C> f(X<A,B>,X<B,C>)
   return result;
 }
 
-main()
+int main()
 {
   X<1,3> x;
   X<1,2> y;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/vbase1.C b/gcc/testsuite/g++.old-deja/g++.law/vbase1.C
index a68c3b1..42282d5 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/vbase1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/vbase1.C
@@ -21,7 +21,7 @@ public:
 	void bar() { b::foo();}
 };
 
-main() {
+int main() {
 	c test;
 	test.bar();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/virtual3.C b/gcc/testsuite/g++.old-deja/g++.law/virtual3.C
index d141f87..d131da4 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/virtual3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/virtual3.C
@@ -41,7 +41,7 @@ BugStream& operator<<(ostream& os, Eval_)
     return ((BugStream&)os).eval();
 }
 
-main() {
+int main() {
     BugStream bs;
     bs << "PASS" << eval;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/virtual4.C b/gcc/testsuite/g++.old-deja/g++.law/virtual4.C
index f6310d3..47af3aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/virtual4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/virtual4.C
@@ -16,7 +16,7 @@ class B:public A
     void SetProp() { if (!aset) { printf ("FAIL\n"); exit (0);} aset--;}
 };
 
-main()
+int main()
 {
     A a;
     B b;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility1.C b/gcc/testsuite/g++.old-deja/g++.law/visibility1.C
index 0314c07..67f4bcd 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility1.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility1.C
@@ -51,7 +51,7 @@ derived_friend()
 
 
 
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 //==========================
 {
     base b;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility13.C b/gcc/testsuite/g++.old-deja/g++.law/visibility13.C
index 8bd6a85..fa5e5dd 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility13.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility13.C
@@ -94,7 +94,7 @@ try_array( Array_RC<Type> &rc )
     try_array( ((Array<Type>&)rc) );
 }
 
-main()
+int main()
 {
     static int ia[10] = { 12, 7, 14, 9, 128, 17, 6, 3, 27, 5 };
     Array_RC<int> iA(ia, 10);// ERROR - instantiated from here
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility16.C b/gcc/testsuite/g++.old-deja/g++.law/visibility16.C
index b5d87ef..32fb706 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility16.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility16.C
@@ -29,7 +29,7 @@ class C : public A {
     }
 };
 
-main() {
+int main() {
     C cvar;
     B bvar(&cvar);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility17.C b/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
index ae198b0..125bf00 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
@@ -25,7 +25,7 @@ public:
   Derived(int n, char* str);
   Derived(int n);
 
-  getNum() {return num_;}
+  int getNum() {return num_;}
 private:
   int num_;
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility2.C b/gcc/testsuite/g++.old-deja/g++.law/visibility2.C
index 8ac5cb9..5806fc5 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility2.C
@@ -51,7 +51,7 @@ derived_friend()
 
 
 
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 //==========================
 {
     base b;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility20.C b/gcc/testsuite/g++.old-deja/g++.law/visibility20.C
index 011abef..82ecaee 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility20.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility20.C
@@ -27,7 +27,7 @@ Derived::noticeThisFunction(Base *b) {
                                 // since it is not called on 'this'
 }
 
-main() {
+int main() {
     Base b;
     Derived d;
     d.noticeThisFunction(&b);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility24.C b/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
index b40075f..dab2148 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
@@ -34,7 +34,7 @@ private:
 };
 
 
-main()
+int main()
 {
     C c;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility7.C b/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
index 26d172b..764da35 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
@@ -59,7 +59,7 @@ class C {
 };
 
 
-main()
+int main()
 {
   B* bobject = new B(2, 1);
   C* cobject = new C(bobject);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/vtable3.C b/gcc/testsuite/g++.old-deja/g++.law/vtable3.C
index 5759026..9a6e4a2 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/vtable3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/vtable3.C
@@ -17,7 +17,7 @@ struct B : virtual A {
 };
 
 
-main()
+int main()
 {
     B blist[10];
     printf ("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/align1.C b/gcc/testsuite/g++.old-deja/g++.mike/align1.C
index e26d398..df6faa6 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/align1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/align1.C
@@ -51,6 +51,6 @@ class interproc_jump_edge : public eel_interproc_jump_edge,
 public:
 };
 
-main () {
+int main () {
   void *vp = new interproc_jump_edge();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/align2.C b/gcc/testsuite/g++.old-deja/g++.mike/align2.C
index 36791fe..758e43c 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/align2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/align2.C
@@ -6,7 +6,7 @@ public:
   int b;
 } x;
 
-main()
+int main()
 {
   // printf("Foo offset %d\n", (int)(Foo*)&x - (int)&x);
   // printf("b offset %d\n", (int)&x.b - (int)&x);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/ambig1.C b/gcc/testsuite/g++.old-deja/g++.mike/ambig1.C
index 5f67b74..4552791 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/ambig1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/ambig1.C
@@ -23,7 +23,7 @@ class rM : public M {
 class D : public lM, rM {
 } d;				// ERROR - ambiguous function
 
-main() {
+int main() {
   ((lM*)&d)->i = 1;
   ((rM*)&d)->i = 2;
   ((rM*)&d)->f();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/conv1.C b/gcc/testsuite/g++.old-deja/g++.mike/conv1.C
index b67ecbb..468bc42 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/conv1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/conv1.C
@@ -4,7 +4,7 @@ E foo() {
   return C;
 }
 
-main() {
+int main() {
   if (foo() != C)
     return 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh19.C b/gcc/testsuite/g++.old-deja/g++.mike/eh19.C
index 06b3dbe..6e4fe15 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh19.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh19.C
@@ -4,13 +4,13 @@
 class test1 {
 public:
   class fehler{public:fehler(){};};
-  func(int a) {
+  void func(int a) {
     if( a == 0 )
       throw fehler();
   }
 };
 
-main() {
+int main() {
   test1 var;
 
   try {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh33.C b/gcc/testsuite/g++.old-deja/g++.mike/eh33.C
index 49214f1..234b745 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh33.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh33.C
@@ -7,9 +7,9 @@ void my_unexpected() {
   throw 42;
 }
 
-foo() throw (int) { throw "Hi"; }
+void foo() throw (int) { throw "Hi"; }
 
-main() {
+int main() {
   std::set_unexpected (my_unexpected);
   try {
     foo();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh34.C b/gcc/testsuite/g++.old-deja/g++.mike/eh34.C
index 0f27801..9c7e985 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh34.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh34.C
@@ -7,9 +7,9 @@ void my_unexpected() {
   exit (0);
 }
 
-foo() throw () { throw "Hi"; }
+void foo() throw () { throw "Hi"; }
 
-main() {
+int main() {
   std::set_unexpected (my_unexpected);
   foo();
   return 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh4.C b/gcc/testsuite/g++.old-deja/g++.mike/eh4.C
index 5de9b03..c87ab29 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh4.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh4.C
@@ -1,6 +1,6 @@
 // Build don't link:
 // Special g++ Options: -fexceptions
 
-foo() {
+void foo() {
   throw 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh49.C b/gcc/testsuite/g++.old-deja/g++.mike/eh49.C
index 3a301cc..0505db1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh49.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh49.C
@@ -1,11 +1,11 @@
 // Special g++ Options: -fexceptions -O9
 // excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
 
-main1() {
+void main1() {
   throw 1;
 }
 
-main() {
+int main() {
   try {
     main1();
   } catch (...) {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh6.C b/gcc/testsuite/g++.old-deja/g++.mike/eh6.C
index f540986..b9e7c8c 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh6.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh6.C
@@ -3,12 +3,12 @@
 
 extern "C" int printf(const char *, ...);
 
-main1() {
+void main1() {
   throw 1;
 }
 
 
-main() {
+int main() {
   try {
     main1();
   } catch (...) {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/err2.C b/gcc/testsuite/g++.old-deja/g++.mike/err2.C
index e7f0be2..c3af5b4 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/err2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/err2.C
@@ -1,6 +1,6 @@
 class foo {
 public:
-  apply(foo *(foo::*memptr)()) {
+  void apply(foo *(foo::*memptr)()) {
     this->*memptr();		// ERROR - wrong
   }
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/leak1.C b/gcc/testsuite/g++.old-deja/g++.mike/leak1.C
index 849322f..2a6c337 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/leak1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/leak1.C
@@ -31,7 +31,7 @@ void bar() {
 
 int i = int(s+b);
 
-main() {
+int main() {
   bar();
   bar();
   return count != 2;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/misc1.C b/gcc/testsuite/g++.old-deja/g++.mike/misc1.C
index 1703b54..0604eac 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/misc1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/misc1.C
@@ -22,7 +22,7 @@ class C {
     --count;
     printf("down\n");
   }
-  operator ++() {
+  int operator ++() {
     return ++val;
   }
   operator int() {
@@ -38,7 +38,7 @@ void bar() {
       foo();
 }
 
-main() {
+int main() {
   bar();
   if (C::count)
     {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/misc13.C b/gcc/testsuite/g++.old-deja/g++.mike/misc13.C
index 80874b1..166e33d 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/misc13.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/misc13.C
@@ -39,7 +39,7 @@ ivHandler *bar2() {
   return &a;
 }
 
-main() {
+int main() {
   want=vf_request;
   bar()->request();
   want=vf_event;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/misc14.C b/gcc/testsuite/g++.old-deja/g++.mike/misc14.C
index 75827cb..4886dcc 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/misc14.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/misc14.C
@@ -18,7 +18,7 @@ public:
   }
 };
 
-main() {
+int main() {
   B b;
   A *ap = &b;
   ap->~A();  // This should call the destructor virtually.
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/misc8.C b/gcc/testsuite/g++.old-deja/g++.mike/misc8.C
index 4cea213..cf15c82 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/misc8.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/misc8.C
@@ -2,4 +2,4 @@
 // GROUPS passed vtable
 class T { public: virtual ~T() {} };
 template<class P> class X : public virtual T {};
-main() { X<int> x; }
+int main() { X<int> x; }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net10.C b/gcc/testsuite/g++.old-deja/g++.mike/net10.C
index a290b46..4546bf1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net10.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net10.C
@@ -4,7 +4,7 @@
 const int ci=10, *pc = &ci, *const cpc = pc, **ppc;
 int i, *p, *const cp = &i;
 
-main()
+int main()
 {
   i = ci;
   *cp = ci;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net17.C b/gcc/testsuite/g++.old-deja/g++.mike/net17.C
index f80eeb3..5befc4f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net17.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net17.C
@@ -51,7 +51,7 @@ public:
 } e;
 
 
-main() {
+int main() {
   if (++i != 6)
     exit(1);
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net22.C b/gcc/testsuite/g++.old-deja/g++.mike/net22.C
index 088a0fe..f18d056 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net22.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net22.C
@@ -7,7 +7,7 @@ public:
 class Child : public Parent {
 };				// ERROR - called
 
-main() {
+int main() {
   Child c( "String initializer" );	// ERROR - bad
   return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net26.C b/gcc/testsuite/g++.old-deja/g++.mike/net26.C
index 5a00c8e..753c5f6 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net26.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net26.C
@@ -19,7 +19,7 @@ S s = { &A::foo, &A::vfoo, &A::foo };
 
 A a;
 
-main() {
+int main() {
   (a.*s.pfn1)();
   (a.*s.pfn2)();
   printf("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net34.C b/gcc/testsuite/g++.old-deja/g++.mike/net34.C
index 06d196c..51266a3 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net34.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net34.C
@@ -30,7 +30,7 @@ public:
         }
 };
 
-main() {
+int main() {
         multiple m(1,2);
         m.print();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net38.C b/gcc/testsuite/g++.old-deja/g++.mike/net38.C
index 5732d59..2b7c0c4 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net38.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net38.C
@@ -17,7 +17,7 @@ int (C::*vmpb) () = &C::b;
 int (C::*vmpb2) () = &C::b2;
 int (C::*vmpa) () = &C::a;
 
-main () {
+int main () {
   C c;
   if ((c.*vmpa)() != 1)
     return 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net41.C b/gcc/testsuite/g++.old-deja/g++.mike/net41.C
index 6f02d3c..2c29e9b 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net41.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net41.C
@@ -1,3 +1,3 @@
-main() {
+int main() {
   int i = ~ false;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net43.C b/gcc/testsuite/g++.old-deja/g++.mike/net43.C
index c2c7893..3a34c8f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net43.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net43.C
@@ -5,7 +5,7 @@ class foo {
    friend int operator ^(const foo&, const foo&);
 };
 
-main ()
+int main ()
 {
    int (*funptr) (const foo &, const foo &)  = operator ^;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net45.C b/gcc/testsuite/g++.old-deja/g++.mike/net45.C
index 6f9dc3a..388af8f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net45.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net45.C
@@ -12,7 +12,7 @@ struct myint {
   }
   myint(const myint& mi) {
   }
-  operator=(const myint& mi) {
+  myint& operator=(const myint& mi) {
   }
 };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net46.C b/gcc/testsuite/g++.old-deja/g++.mike/net46.C
index 235cbfb..ac79501 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net46.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net46.C
@@ -9,7 +9,7 @@ static void *operator new(size_t size) throw (std::bad_alloc) {
   return (void*) 0;
 }
 
-main() {
+int main() {
   cout << "";
   new int;
   return fail;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net8.C b/gcc/testsuite/g++.old-deja/g++.mike/net8.C
index 62b4fed..1282317 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net8.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net8.C
@@ -22,7 +22,7 @@ foo (int& a)
 {				// ERROR - 
 }
 
-main ()
+int main ()
 {
   int b;
   const int*const a = &b;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net9.C b/gcc/testsuite/g++.old-deja/g++.mike/net9.C
index c36151c..7d876dc 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/net9.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/net9.C
@@ -4,7 +4,7 @@
 const int ci=10, *pc = &ci, *const cpc = pc, **ppc;
 int i, *p, *const cp = &i;
 
-main()
+int main()
 {
   ci = 1;	// ERROR - bad
   ci++;		// ERROR - bad
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/ns1.C b/gcc/testsuite/g++.old-deja/g++.mike/ns1.C
index c918927..c347d2d 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/ns1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/ns1.C
@@ -1,11 +1,11 @@
 namespace Foo {
-  bar() {
+  int bar() {
     return 0;
   }
 }
 
 using namespace Foo;
 
-main() {
+int main() {
   bar();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/ns10.C b/gcc/testsuite/g++.old-deja/g++.mike/ns10.C
index 2418004..a6b1c3a 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/ns10.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/ns10.C
@@ -1,9 +1,9 @@
 namespace Foo {
-  bar() {
+  int bar() {
     return 0;
   }
 }
 
-main() {
+int main() {
   return Foo::bar();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/ns11.C b/gcc/testsuite/g++.old-deja/g++.mike/ns11.C
index 77d3110..bde7723 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/ns11.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/ns11.C
@@ -3,16 +3,16 @@ class Foo {
 
 namespace A {
   namespace Foo {
-    bar() {
+    int bar() {
       return 0;
     }
   }
 
-  mymain() {
+  int mymain() {
     return Foo::bar();
   }
 }
 
-main() {
+int main() {
   return A::mymain();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/ns2.C b/gcc/testsuite/g++.old-deja/g++.mike/ns2.C
index 30a263d..365eb8c 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/ns2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/ns2.C
@@ -4,6 +4,6 @@ namespace N {
 
 using namespace N;
 
-main() {
+int main() {
   return i;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/ns9.C b/gcc/testsuite/g++.old-deja/g++.mike/ns9.C
index 65798a7..8d640e7 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/ns9.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/ns9.C
@@ -1,11 +1,11 @@
 namespace Foo {
-  bar() {
+  int bar() {
     return 0;
   }
 }
 
 using Foo::bar;
 
-main() {
+int main() {
   return bar();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/opr-as1.C b/gcc/testsuite/g++.old-deja/g++.mike/opr-as1.C
index 38795b5..935b0ba 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/opr-as1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/opr-as1.C
@@ -6,6 +6,6 @@ class C {
 
 C a, b;
 
-main() {
+int main() {
   a = b;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/opr-dot1.C b/gcc/testsuite/g++.old-deja/g++.mike/opr-dot1.C
index e709057..acef6ad9 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/opr-dot1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/opr-dot1.C
@@ -16,7 +16,7 @@ class derived2 : public derived1, public base2 {
 
 struct test {
   derived2& fails;
-  test1() {
+  void test1() {
     fails.base1::x = 5;
   }
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p10148.C b/gcc/testsuite/g++.old-deja/g++.mike/p10148.C
index 3630976..074724a 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p10148.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p10148.C
@@ -26,7 +26,7 @@ void TCRCB::eat () {
  this->itc();
 }
 
-main() {
+int main() {
   TCRCB a;
   a.eat();
   return fail;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p10849a.C b/gcc/testsuite/g++.old-deja/g++.mike/p10849a.C
index a5c3773..d6d4656 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p10849a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p10849a.C
@@ -27,7 +27,7 @@ struct D : public B, public C
   D() : B(41), C(42) { }
 } d;
 
-main() {
+int main() {
   if (! d.g())
     return 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p1248.C b/gcc/testsuite/g++.old-deja/g++.mike/p1248.C
index 3db677c..035e8e1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p1248.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p1248.C
@@ -18,7 +18,7 @@ void foo() {
   Deranged d;
 }
 
-main()
+int main()
 {
   foo();
   printf("PASS\n");
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p1567.C b/gcc/testsuite/g++.old-deja/g++.mike/p1567.C
index c805818..0b35bd9 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p1567.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p1567.C
@@ -29,7 +29,7 @@ public:
   const char* f3() { return A::f3(); }
 };
 
-main() {
+int main() {
   C* tempC = new C;
   D* tempD = new D;
   A* a = tempC;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p16146.C b/gcc/testsuite/g++.old-deja/g++.mike/p16146.C
index 2fd95e5..070dc2e 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p16146.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p16146.C
@@ -81,7 +81,7 @@ public:
   void j () {};
 };
 
-main () {
+int main () {
   firstBase* fbp = new classImplementation;
   classImplementation* cip = dynamic_cast <classImplementation*> (fbp);
   cip->addRef();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p1862.C b/gcc/testsuite/g++.old-deja/g++.mike/p1862.C
index ff7266f..401b370 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p1862.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p1862.C
@@ -45,7 +45,7 @@ public:
   }
 };
 
-main()
+int main()
 {
   C1 *one = new C1;
   
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p2736.C b/gcc/testsuite/g++.old-deja/g++.mike/p2736.C
index 0ef5b3a..7a04051 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p2736.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p2736.C
@@ -23,6 +23,6 @@ foo() {
 
 A a(2);
 
-main() {
+int main() {
   foo();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p2846.C b/gcc/testsuite/g++.old-deja/g++.mike/p2846.C
index 953e800..b9a44c4 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p2846.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p2846.C
@@ -46,7 +46,7 @@ B A::compute(void) const {
   return sub;
 }
 
-main ()
+int main ()
 {
   A titi;
   A toto = titi.compute();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p2846a.C b/gcc/testsuite/g++.old-deja/g++.mike/p2846a.C
index 363ed5b..8606e42 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p2846a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p2846a.C
@@ -27,7 +27,7 @@ B D::compute(void) const
   return sub;
 }
 
-main () {
+int main () {
   D titi;
   titi.compute().print();
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p2846b.C b/gcc/testsuite/g++.old-deja/g++.mike/p2846b.C
index 0fb8217..acba70d6 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p2846b.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p2846b.C
@@ -44,7 +44,7 @@ B A::compute(void) const
   return sub;
 }
 
-main ()
+int main ()
 {
   A titi;
   titi.compute().beefy();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p2960.C b/gcc/testsuite/g++.old-deja/g++.mike/p2960.C
index f7c88d9..4206e75 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p2960.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p2960.C
@@ -24,7 +24,7 @@ public:
   virtual void f2() { printf("Test3::f2\n"); }
 };
 
-main() {
+int main() {
     Test3 t3;
     return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3041.C b/gcc/testsuite/g++.old-deja/g++.mike/p3041.C
index c059c0e..fd83eaf 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3041.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3041.C
@@ -26,7 +26,7 @@ public:
   void a() { }
 };
 
-main()
+int main()
 {
   C c;
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3060d.C b/gcc/testsuite/g++.old-deja/g++.mike/p3060d.C
index 2813d66..5cf4fdd 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3060d.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3060d.C
@@ -26,7 +26,7 @@ void vfunc(VoidObjMemberFunc of, Object *op, void *v1) {
   (op->*of)(op, v1);
 }
 
-main() {
+int main() {
   Object      o;
 
   vfunc((VoidObjMemberFunc)&Clipper::Feedback, &o, 0);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3068.C b/gcc/testsuite/g++.old-deja/g++.mike/p3068.C
index 52c5cd5..2436c8b 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3068.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3068.C
@@ -51,7 +51,7 @@ public:
   }
 };
 
-main() {
+int main() {
     C& bb = *new C;
     R& mv = bb;
     bb.real(0);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3139.C b/gcc/testsuite/g++.old-deja/g++.mike/p3139.C
index 9ff9b23c..192fa72 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3139.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3139.C
@@ -18,7 +18,7 @@ class C : public B {
   int a() { return 42; }
 };
 
-main() {
+int main() {
   B * b = new C;
   printf("%d.\n", b->a());
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3570.C b/gcc/testsuite/g++.old-deja/g++.mike/p3570.C
index abccf79..1213a96 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3570.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3570.C
@@ -16,7 +16,7 @@ struct C :  B {
    void print() {superC::print(); printf("C");};
 };
 
-main ()
+int main ()
 {
    A a;
    B b;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3708.C b/gcc/testsuite/g++.old-deja/g++.mike/p3708.C
index 2f5e401..cda1108 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708.C
@@ -8,19 +8,19 @@ void *ptr;
 class A {
 public:
   A() { printf ("A is constructed.\n"); }
-  virtual xx(int doit) { printf ("A is destructed.\n"); }
+  virtual void xx(int doit) { printf ("A is destructed.\n"); }
 };
 
 class A1 {
 public:
   A1() { printf ("A1 is constructed.\n"); }
-  virtual xx(int doit) { printf ("A1 is destructed.\n"); }
+  virtual void xx(int doit) { printf ("A1 is destructed.\n"); }
 };
 
 class B : public virtual A, public A1 {
 public:
   B() { printf ("B is constructed.\n"); }
-  virtual xx(int doit) {
+  virtual void xx(int doit) {
     printf ("B is destructed.\n");
     A1::xx (1);
     if (doit) A::xx (1);
@@ -34,7 +34,7 @@ public:
   C() { ++num; printf ("C is constructed.\n");
       ptr = this;
       }
-  virtual xx(int doit) {
+  virtual void xx(int doit) {
     --num;
     if (ptr != this)
       printf("FAIL\n%x != %x\n", ptr, this);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C b/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C
index 1fecb16..03fd1a1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708a.C
@@ -8,19 +8,19 @@ void *ptr;
 class A {
 public:
   A() { printf ("A is constructed.\n"); }
-  virtual xx(int doit) { printf ("A is destructed.\n"); }
+  virtual void xx(int doit) { printf ("A is destructed.\n"); }
 };
 
 class A1 {
 public:
   A1() { printf ("A1 is constructed.\n"); }
-  virtual xx(int doit) { printf ("A1 is destructed.\n"); }
+  virtual void xx(int doit) { printf ("A1 is destructed.\n"); }
 };
 
 class B :  public A1, public virtual A {
 public:
   B() { printf ("B is constructed.\n"); }
-  virtual xx(int doit) {
+  virtual void xx(int doit) {
     printf ("B is destructed.\n");
     A1::xx (1);
     if (doit) A::xx (1);
@@ -34,7 +34,7 @@ public:
   C() { ++num; printf ("C is constructed.\n");
       ptr = this;
       }
-  virtual xx(int doit) {
+  virtual void xx(int doit) {
     --num;
     if (ptr != this)
       printf("FAIL\n%x != %x\n", ptr, this);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C b/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C
index dddb77c..4251007 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p3708b.C
@@ -8,19 +8,19 @@ void *ptr;
 class A {
 public:
   A() { printf ("A is constructed.\n"); }
-  virtual xx(int doit) { printf ("A is destructed.\n"); }
+  virtual void xx(int doit) { printf ("A is destructed.\n"); }
 };
 
 class A1 {
 public:
   A1() { printf ("A1 is constructed.\n"); }
-  virtual xx(int doit) { printf ("A1 is destructed.\n"); }
+  virtual void xx(int doit) { printf ("A1 is destructed.\n"); }
 };
 
 class B : public virtual A, public A1 {
 public:
   B() { printf ("B is constructed.\n"); }
-  virtual xx(int doit) {
+  virtual void xx(int doit) {
     printf ("B is destructed.\n");
     A1::xx (1);
     if (doit) A::xx (1);
@@ -33,7 +33,7 @@ class C : public virtual A {
 public:
   C() { printf ("C is constructed.\n");
       }
-  virtual xx(int doit) {
+  virtual void xx(int doit) {
     printf ("C is destructed.\n");
     if (doit) A::xx (1);
   }
@@ -44,7 +44,7 @@ public:
   D() { ++num; printf ("D is constructed.\n");
       ptr = this;
       }
-  virtual xx(int doit) {
+  virtual void xx(int doit) {
     --num;
     if (ptr != this) {
       printf("FAIL\n%x != %x\n", ptr, this);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4068.C b/gcc/testsuite/g++.old-deja/g++.mike/p4068.C
index e2531ed..fbdf02e 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4068.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4068.C
@@ -16,7 +16,7 @@ void A::d() {
   (this->*(f()))();
 }
 
-main() {
+int main() {
   A a;
   a.d();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4246.C b/gcc/testsuite/g++.old-deja/g++.mike/p4246.C
index 1eb6668..a610f70 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4246.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4246.C
@@ -8,7 +8,7 @@ class A
  public:
   A() { }
   virtual  ~A() { }
-  virtual  id() { }
+  virtual void id() { }
 };
 
 class B
@@ -16,7 +16,7 @@ class B
  public:
   B() { }
   virtual  ~B() { }
-  virtual  id() { }
+  virtual void id() { }
 };
 
 class C : public A, public B
@@ -24,7 +24,7 @@ class C : public A, public B
  public:
   C() { }
   virtual  ~C() { }
-  id() { abort(); }
+  void id() { abort(); }
 };
 
 class D : public C
@@ -32,10 +32,10 @@ class D : public C
  public:
   D() { ++num_d; }
   virtual  ~D() { -- num_d; }
-  id() { }
+  void id() { }
 };
 
-main()
+int main()
 {
   D* dp2 = new D;
   ((B*)dp2)->id();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4511.C b/gcc/testsuite/g++.old-deja/g++.mike/p4511.C
index a3c8310..e8555da 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4511.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4511.C
@@ -24,7 +24,7 @@ public:
 
 class E : public D { };
 
-main() {
+int main() {
   E e;
   e.f();
   E * ep = &e;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4619.C b/gcc/testsuite/g++.old-deja/g++.mike/p4619.C
index b401d7d..8b77258 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4619.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4619.C
@@ -1,7 +1,7 @@
 // Build don't link:
 // prms-id: 4619
 
-main() {
+int main() {
   int i = 3;
   int (*p)[10] = new int [20][10];
   int (*p1)[5][7][13][10] = new int [i][5][7][13][10];
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4623.C b/gcc/testsuite/g++.old-deja/g++.mike/p4623.C
index c96388d..00ab576 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4623.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4623.C
@@ -30,6 +30,6 @@ public:
   void d_print() { }
 };
 
-main() {
+int main() {
   derived d(1); d.d_print(); return 0;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4693.C b/gcc/testsuite/g++.old-deja/g++.mike/p4693.C
index 09e1333..b0d0d88 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4693.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4693.C
@@ -18,7 +18,7 @@ public:
   void set_var() { }
 };
 
-main() {
+int main() {
   d * test;
   test = new d;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4736b.C b/gcc/testsuite/g++.old-deja/g++.mike/p4736b.C
index 19d655c..0978f0b 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4736b.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4736b.C
@@ -31,7 +31,7 @@ public:
   virtual int foo() { return 5; }
 };
 
-main() {
+int main() {
   Main m;
   if (m.foo() != 5)
     return 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p4736c.C b/gcc/testsuite/g++.old-deja/g++.mike/p4736c.C
index de5e4b69..f76b06a 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p4736c.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p4736c.C
@@ -33,7 +33,7 @@ public:
   virtual ~Main() { did_fail = 0; }
 };
 
-main() {
+int main() {
   Main* m;
   did_fail = 1;
   delete new Main;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p5469.C b/gcc/testsuite/g++.old-deja/g++.mike/p5469.C
index 3f5029d..9af2010 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p5469.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p5469.C
@@ -11,7 +11,7 @@ public:
   int operator== (const A& r) { return 0; }
 };
 
-main() {
+int main() {
   {
     A a (1);
     if (a == 2 && a == 1)
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p5469a.C b/gcc/testsuite/g++.old-deja/g++.mike/p5469a.C
index efcd2f4..0783f77 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p5469a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p5469a.C
@@ -11,7 +11,7 @@ public:
   int operator== (const A& r) { return 1; }
 };
 
-main() {
+int main() {
   {
     A a (1);
     if (a == 2 || a == 1)
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p5571.C b/gcc/testsuite/g++.old-deja/g++.mike/p5571.C
index d9a3a471..ec350ea 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p5571.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p5571.C
@@ -19,7 +19,7 @@ public:
   virtual ~ParentTwo() {};
 private:
   int MoreData[12];
-  virtual foo() { return 0; }
+  virtual int foo() { return 0; }
 };
 
 struct Child : public ParentOne, public ParentTwo {
@@ -60,7 +60,7 @@ struct Student : public Child {
   }
 };
 
-main() {
+int main() {
   Student  o;
   o.LocalPrintThis();
   o.ForcedPrintThis();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p5673.C b/gcc/testsuite/g++.old-deja/g++.mike/p5673.C
index 8d29191..d972ab0 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p5673.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p5673.C
@@ -12,7 +12,7 @@ int foo() {
   return A();
 }
 
-main() {
+int main() {
   return foo() != 7;
 }
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p5840.C b/gcc/testsuite/g++.old-deja/g++.mike/p5840.C
index 53b9510..34dd37d 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p5840.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p5840.C
@@ -28,7 +28,7 @@ Derived a;
 /* Bar<Derived, &Signal::Name> dispatcher1; */
 Bar<Derived, &Derived::Name> dispatcher2;
 
-main() {
+int main() {
   /* int i1 = dispatcher1.value(&a); */
   int i2 = dispatcher2.value(&a);
   return /* i1 != 1 || */ i2 != 2;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p6311.C b/gcc/testsuite/g++.old-deja/g++.mike/p6311.C
index 12d3cfc..a0ef8c8 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p6311.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p6311.C
@@ -6,7 +6,7 @@ struct Foo {
 
 int Foo::*pmd = &Foo::member;
 
-main() {
+int main() {
   if (pmd == 0)
     return 1;
   if (a.*pmd != 42)
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p658.C b/gcc/testsuite/g++.old-deja/g++.mike/p658.C
index 614f7e9..14658f0 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p658.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p658.C
@@ -35,7 +35,7 @@ private:
     char _c;
 };
 
-main()
+int main()
 {
     Char r, s;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p6927.C b/gcc/testsuite/g++.old-deja/g++.mike/p6927.C
index 827ef29..7a0ec42 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p6927.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p6927.C
@@ -10,7 +10,7 @@ Object::Object() : Value(-1) { }
 
 Object *pArr = new Object[2];
 
-main() {
+int main() {
   if (pArr[0].Value != -1 || pArr[1].Value != -1)
     return 1;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p701.C b/gcc/testsuite/g++.old-deja/g++.mike/p701.C
index 4acf170..c222ea1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p701.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p701.C
@@ -27,7 +27,7 @@ A::Safe() const
    Munge(i);	// ERROR - should not be able to modify a const object
 }
 
-main()
+int main()
 {
    const A a(1);
    a.Safe();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p710.C b/gcc/testsuite/g++.old-deja/g++.mike/p710.C
index c6ab3b1..62dffe9 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p710.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p710.C
@@ -35,7 +35,7 @@ class B
    void operator delete(void*){}
 };
 
-main()
+int main()
 {
    B* p = new B;
    delete p;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p7325.C b/gcc/testsuite/g++.old-deja/g++.mike/p7325.C
index 9cf4604..e6d76f5 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p7325.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p7325.C
@@ -48,7 +48,7 @@ void g ()
   A::match_this = 0;
 }
 
-main() {
+int main() {
   f();
   g();
   return fail;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p755.C b/gcc/testsuite/g++.old-deja/g++.mike/p755.C
index 9dbebff..256c985 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p755.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p755.C
@@ -10,7 +10,7 @@ void* operator new(size_t sz) throw (std::bad_alloc) {
   return p;
 }
 
-main () {
+int main () {
   int* i = new int;
   delete i;
   return 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p755a.C b/gcc/testsuite/g++.old-deja/g++.mike/p755a.C
index 9f496c1..73172c1 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p755a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p755a.C
@@ -7,7 +7,7 @@ void operator delete(void *p) throw() {
   exit(0);
 }
 
-main () {
+int main () {
   int* i = new int;
   delete i;
   return 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p7626.C b/gcc/testsuite/g++.old-deja/g++.mike/p7626.C
index 61636d6..8e38667 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p7626.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p7626.C
@@ -36,7 +36,7 @@ AFX_MSGMAP_ENTRY  CDialog ::_messageEntries[] = {
   { (AFX_PMSG)0 }
 }; 
 
-main() {
+int main() {
   CDialog d;
   (d.*((CDialog::_messageEntries)[0]).pfn)();	// This should call CDialog::OnMyMsg
   return fail;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p7651.C b/gcc/testsuite/g++.old-deja/g++.mike/p7651.C
index a295a89..487b0d5 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p7651.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p7651.C
@@ -20,6 +20,6 @@ int DingDong(double A) {
 }
 
 
-main() {
+int main() {
   DingDong(1.0);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p783.C b/gcc/testsuite/g++.old-deja/g++.mike/p783.C
index ce22a7c..4194fa8 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p783.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p783.C
@@ -8,7 +8,7 @@ public:
   ~C() { }
 };
 
-main(int argc, char**argv) {
+int main(int argc, char**argv) {
   C c,d;
   c = (argc&1) ? C() : d;
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p783a.C b/gcc/testsuite/g++.old-deja/g++.mike/p783a.C
index 1883fc7..6321a7b 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p783a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p783a.C
@@ -19,7 +19,7 @@ public:
   }
 };
 
-main(int argc, char**argv) {
+int main(int argc, char**argv) {
   C c;
   c = C();
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p783b.C b/gcc/testsuite/g++.old-deja/g++.mike/p783b.C
index f4170bc..35a18f3 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p783b.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p783b.C
@@ -28,7 +28,7 @@ C func()  {
   return g;
 }
 
-main(int argc, char**argv) {
+int main(int argc, char**argv) {
   C c,d;
 //  printf ("\n");
   c = (argc != 1) ? C() : d;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p786.C b/gcc/testsuite/g++.old-deja/g++.mike/p786.C
index 258c365..c55d0c0 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p786.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p786.C
@@ -25,7 +25,7 @@ void testit(const C& a, C& b)
    func(a,b);
 }
 
-main()
+int main()
 {
    C a;
    C b;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p7865.C b/gcc/testsuite/g++.old-deja/g++.mike/p7865.C
index d9a6118..2cac1d5 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p7865.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p7865.C
@@ -22,7 +22,7 @@ int bar()
   return 0;
 }
 
-main() {
+int main() {
   bar();
   return count;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p789.C b/gcc/testsuite/g++.old-deja/g++.mike/p789.C
index 0981598..9cad4fd 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p789.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p789.C
@@ -17,7 +17,7 @@ struct bar : virtual public foo
 // bar array[3][3];
 foo array[3][3];
 
-main ()
+int main ()
 {
   for (int i = 0; i < 3; i++)
     for (int j = 0; j < 3; j++) {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p789a.C b/gcc/testsuite/g++.old-deja/g++.mike/p789a.C
index 9086ff5..b0df9f6 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p789a.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p789a.C
@@ -22,7 +22,7 @@ struct foo
 int foo::count;
 
 
-main ()
+int main ()
 {
   {
     foo array[3][3];
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p8039.C b/gcc/testsuite/g++.old-deja/g++.mike/p8039.C
index 73defec..fe58d09 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p8039.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p8039.C
@@ -7,7 +7,7 @@ public:
 
 extern void bar(int*);
 
-main()
+int main()
 {
   int (C::*mfp)() = &C::func;
   bar((int*)mfp);		// ERROR - no clear semantics
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p807.C b/gcc/testsuite/g++.old-deja/g++.mike/p807.C
index 59df08e..00c49e7 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p807.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p807.C
@@ -26,7 +26,7 @@ class B
 int foo(B& b);			// ERROR - referenced below
 
 
-main()
+int main()
 {
    AX a;
    foo(a);  // ERROR - Ambiguous B(a) or a.operator B()  //  See ARM 12.3.2
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p8155.C b/gcc/testsuite/g++.old-deja/g++.mike/p8155.C
index f622910..5be1491 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p8155.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p8155.C
@@ -139,7 +139,7 @@ AFX_MSGMAP_ENTRY   CMainWindow ::_messageEntries[] = {
   {0, (AFX_PMSG)0 }
 }; 
 
-main( int argc, char **argv) {
+int main( int argc, char **argv) {
   CMainWindow     myWindow;
 
   myWindow.callProc();
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p8460.C b/gcc/testsuite/g++.old-deja/g++.mike/p8460.C
index 542921c..d4b3e8f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p8460.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p8460.C
@@ -9,7 +9,7 @@ public:
 private:
 };
 
-main()
+int main()
 {
   A a;
   
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p8483.C b/gcc/testsuite/g++.old-deja/g++.mike/p8483.C
index b049018..8e6293f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p8483.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p8483.C
@@ -25,7 +25,7 @@ private:
   A d[2][2][2];
 };
 
-main() {
+int main() {
   { A a; }
   { B b; }
   { C c; }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p8785.C b/gcc/testsuite/g++.old-deja/g++.mike/p8785.C
index 9c977fd..4f5146b 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p8785.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p8785.C
@@ -16,7 +16,7 @@ public:
   };
 };
 
-main() {
+int main() {
   Outer::Inner A;
   Outer Thing;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p8804.C b/gcc/testsuite/g++.old-deja/g++.mike/p8804.C
index e46a4c6..df787b8f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p8804.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p8804.C
@@ -13,6 +13,6 @@ struct Fails {
 
 Fails d;
 
-main() {
+int main() {
   return &d.i == &d.c;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/pmf1.C b/gcc/testsuite/g++.old-deja/g++.mike/pmf1.C
index 5b2dde8..a39512f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/pmf1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/pmf1.C
@@ -30,7 +30,7 @@ int (MD::* pmf0)(int) = &MD::f;
 int (MD::* pmf1)(int) = &MD::g;
 int (MD::* pmf2)(int) = &MD::hf;
 
-main()
+int main()
 {
   MD obj;
   int fail = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/pmf2.C b/gcc/testsuite/g++.old-deja/g++.mike/pmf2.C
index 2f1bec5..5a5aa06 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/pmf2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/pmf2.C
@@ -40,7 +40,7 @@ void B_table::call_fn_fn1(int &item, void *pfn1) {
 B_table b;
 bar jar;
 
-main() {
+int main() {
   printf("ptr to B_table=%x, ptr to A_table=%x\n",&b,(A_table*)&b);
   B_table::B_ti_fn z = &B_table::func1;
   int j = 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/pmf6.C b/gcc/testsuite/g++.old-deja/g++.mike/pmf6.C
index c532707..6848781 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/pmf6.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/pmf6.C
@@ -6,7 +6,7 @@ public:
   void foo() {
     pmf();			// WARNING - 
   }
-  static foo1(S* sp) {
+  static void foo1(S* sp) {
     (sp->pmf)();		// ERROR - 
   }
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/rtti2.C b/gcc/testsuite/g++.old-deja/g++.mike/rtti2.C
index bf08ede..0c8b8b0 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/rtti2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/rtti2.C
@@ -1,5 +1,5 @@
 #include <typeinfo>
 
-main() {
+int main() {
   typeid(bool);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/scast1.C b/gcc/testsuite/g++.old-deja/g++.mike/scast1.C
index dbc5efc..11666b4 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/scast1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/scast1.C
@@ -1,7 +1,7 @@
 class A {};
 class C {};
 
-main() {
+int main() {
   A* a = 0;
   C* c = static_cast<C*>(a);	// ERROR - bad static cast 
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/temp.C b/gcc/testsuite/g++.old-deja/g++.mike/temp.C
index 8ca31f3..5a1ce67 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/temp.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/temp.C
@@ -25,7 +25,7 @@ public:
 
 int foo() { return getenv("TEST") == 0; }
 
-main() {
+int main() {
   int i = foo() ? s+b : s;
   return i != 2;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/virt5.C b/gcc/testsuite/g++.old-deja/g++.mike/virt5.C
index a9040c9..dac85cc 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/virt5.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/virt5.C
@@ -44,7 +44,7 @@ public:
   ~LAST () { print_STATE(); }
 };
 
-main() {
+int main() {
   MIBASE *o = new LAST;
   MID *p = o->VFN();
   p->print_STATE();
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/lookup3.C b/gcc/testsuite/g++.old-deja/g++.ns/lookup3.C
index cd1aaae..3ace233 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/lookup3.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/lookup3.C
@@ -8,7 +8,7 @@ int A::f()
   return i;
 }
 
-main()
+int main()
 {
   return A::f();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/ns1.C b/gcc/testsuite/g++.old-deja/g++.ns/ns1.C
index 7c4fd92..f835716 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/ns1.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/ns1.C
@@ -10,7 +10,7 @@ namespace foo{
     }
 }
 
-main(int,char**)
+int main(int,char**)
 {
   return foo::eine_funktion(1);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/ns12.C b/gcc/testsuite/g++.old-deja/g++.ns/ns12.C
index 33d50b1..40f5b7c 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/ns12.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/ns12.C
@@ -16,7 +16,7 @@ int barney()
   return 1;
 }
 
-main()
+int main()
 {
   return fred::barney();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/ns13.C b/gcc/testsuite/g++.old-deja/g++.ns/ns13.C
index 0272055..0b8c38a 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/ns13.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/ns13.C
@@ -7,7 +7,7 @@ namespace std{
 void std::g()
 {}
 
-main()
+int main()
 {
   return std::i-5;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/ns2.C b/gcc/testsuite/g++.old-deja/g++.ns/ns2.C
index dcef203..e0d1bda 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/ns2.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/ns2.C
@@ -19,7 +19,7 @@ void andere_funktion()
   var=4;
 }
 
-main(int,char**)
+int main(int,char**)
 {
   andere_funktion();
   return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/ns6.C b/gcc/testsuite/g++.old-deja/g++.ns/ns6.C
index 0617b79..ba2508c 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/ns6.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/ns6.C
@@ -7,7 +7,7 @@ namespace A{
   }
 }
 
-main()
+int main()
 {
   return A::i-A::B::i;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.ns/overload1.C b/gcc/testsuite/g++.old-deja/g++.ns/overload1.C
index 6f6f3d4..55d66a1 100644
--- a/gcc/testsuite/g++.old-deja/g++.ns/overload1.C
+++ b/gcc/testsuite/g++.old-deja/g++.ns/overload1.C
@@ -21,7 +21,7 @@ int f(int,int)
 using namespace A;
 using namespace B;
 
-main()
+int main()
 {
   if(f() != 1)
     return 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.other/cleanup1.C b/gcc/testsuite/g++.old-deja/g++.other/cleanup1.C
index ce37360..fd4dc6e 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/cleanup1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/cleanup1.C
@@ -12,7 +12,7 @@ int f (const A& a)
   return 1;
 }
 
-main ()
+int main ()
 {
   if (f (A()) && d == 0)
     return 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.other/overload1.C b/gcc/testsuite/g++.old-deja/g++.other/overload1.C
index dde6d4f..59191d5 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/overload1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/overload1.C
@@ -4,7 +4,7 @@ struct A {
 
 A operator+ (A, float);
 
-main ()
+int main ()
 {
   A a;
   a + 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/array1.C b/gcc/testsuite/g++.old-deja/g++.pt/array1.C
index 436b4ef..669600f 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/array1.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/array1.C
@@ -3,7 +3,7 @@ template <class T, unsigned N>
 template <class T, unsigned N>
   unsigned size(T const (&)[N]) { return N; }
 
-main() {
+int main() {
   short iarray[] = { 1, 2, 3, 4, 5 };
   const short carray[] = { 1, 2, 3, 4, 5 };
   return size(iarray) - size(carray);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash10.C b/gcc/testsuite/g++.old-deja/g++.pt/crash10.C
index 974cafc..033e234 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash10.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash10.C
@@ -6,6 +6,6 @@ public:
   enum { val = (N == 0) ? M : GCD<N, M % N>::val }; 
 };
 
-main() {
+int main() {
   GCD< 1, 0 >::val; // ERROR - division
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/crash8.C b/gcc/testsuite/g++.old-deja/g++.pt/crash8.C
index 2fd687a..deff42d 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/crash8.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/crash8.C
@@ -27,7 +27,7 @@ void doit(T x) {
   p2 = TestClass2(); // ERROR - template used as expression
 }
 
-main() {
+int main() {
   double x;
   doit(x);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/m1.C b/gcc/testsuite/g++.old-deja/g++.pt/m1.C
index 2d13213..7de0e0c 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/m1.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/m1.C
@@ -3,7 +3,7 @@
 int f1 () {
   struct A {
     A() : b (2) { }
-    fred () { return b.hi_mom; }
+    int fred () { return b.hi_mom; }
     struct B {
       int hi_mom;
       B (int a) { hi_mom = a; }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memclass1.C b/gcc/testsuite/g++.old-deja/g++.pt/memclass1.C
index 2a9a6f6..5ad839c 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memclass1.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memclass1.C
@@ -5,7 +5,7 @@ template <class T> struct A {
   };
 };
 
-main ()
+int main ()
 {
   A<int>::B<char> b;
   b.f (42);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memclass2.C b/gcc/testsuite/g++.old-deja/g++.pt/memclass2.C
index 2fc5c31..895fd61 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memclass2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memclass2.C
@@ -8,7 +8,7 @@ template <class T> struct A {
   };
 };
 
-main ()
+int main ()
 {
   A<int>::B<char> b;
   b.f (42);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memclass3.C b/gcc/testsuite/g++.old-deja/g++.pt/memclass3.C
index 2174a3b..77744f8 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memclass3.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memclass3.C
@@ -13,7 +13,7 @@ template <class T> struct A {
   };
 };
 
-main ()
+int main ()
 {
   A<int>::B<int>::C<int>::D<int>::E<int>::F<int> b;
   b.f (42);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memclass4.C b/gcc/testsuite/g++.old-deja/g++.pt/memclass4.C
index de490e0..4c101c6 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memclass4.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memclass4.C
@@ -15,7 +15,7 @@ struct alloc_traits
   typedef typename Allocator::template rebind<T>::other allocator_type;
 };
 
-main ()
+int main ()
 {
   typedef alloc_traits<int, allocator<void> >::allocator_type at;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memclass5.C b/gcc/testsuite/g++.old-deja/g++.pt/memclass5.C
index 69b3bcc..06a1413 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memclass5.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memclass5.C
@@ -16,7 +16,7 @@ void f ()
 
 template <class T> struct C: public A<T>::B<T> { };
   
-main ()
+int main ()
 {
   f<int, char>();
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp43.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp43.C
index 0948f82..3d8e3ad 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp43.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp43.C
@@ -8,7 +8,7 @@ public:
     void operator=(A<U, N> const & a) { return; }
 };
 
-main()
+int main()
 {
     A<float, 3> a;
     A<double, 3> b;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp44.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp44.C
index e6d2f87..c8d6f16 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp44.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp44.C
@@ -13,7 +13,7 @@ public:
     void func(U v1) {}
 };
 
-main()
+int main()
 {
   A<float> a;
   a.func(3);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp45.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp45.C
index f8bb478..d71f25d 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp45.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp45.C
@@ -13,7 +13,7 @@ public:
     void func(U v1 = 0) {}
 };
 
-main()
+int main()
 {
   A<float> a;
   a.func(3);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp46.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp46.C
index e841ae8..2212a52 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp46.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp46.C
@@ -13,7 +13,7 @@ public:
   void func(V v1 = 0) {}
 };
 
-main()
+int main()
 {
   A<float, int> a;
   a.func("abc");
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp63.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp63.C
index 6b7fc8e..4f793d4 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp63.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp63.C
@@ -6,7 +6,7 @@ A<int> a;
 
 template <class T> template <class U> void A<T>::f (U u) { }
 
-main()
+int main()
 {
   a.f (24);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp67.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp67.C
index bcf5960..7170c90 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp67.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp67.C
@@ -5,7 +5,7 @@ struct A
   operator A<T2>() const { return A<T2>(); }
 };
 
-main()
+int main()
 {
   A<int> a1;
   A<long> a2;    
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp69.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp69.C
index 1893219..4c9a2a9 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp69.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp69.C
@@ -24,7 +24,7 @@ struct X
   void f(const T1&) {}
 };
 
-main(int ac, char* av[]) {
+int main(int ac, char* av[]) {
   S s;
   s.g();
   int i[] = {1,2,3,4,5};
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/static3.C b/gcc/testsuite/g++.old-deja/g++.pt/static3.C
index b3040ac..4276c3a 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/static3.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/static3.C
@@ -6,7 +6,7 @@ struct A {
 template <class T>
 T A<T>::arr[5] = { 0, 1, 2, 3, 4 };
 
-main ()
+int main ()
 {
   return A<int>::arr[0];
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/static_cast.C b/gcc/testsuite/g++.old-deja/g++.pt/static_cast.C
index f4c334e..26f26c5 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/static_cast.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/static_cast.C
@@ -16,7 +16,7 @@ template<class R> void f(R)
    accumulate(0, static_cast<int (*)(int, R&)>(p) );
 }
 
-main()
+int main()
 {
    f(0);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/t16.C b/gcc/testsuite/g++.old-deja/g++.pt/t16.C
index a5b19e4..4cdf3a2 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/t16.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/t16.C
@@ -17,7 +17,7 @@ class complex
   void print () { }
 };
 
-main ()
+int main ()
 {
   complex c1 (1, 0);
   complex c2 (2, 0);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/tiemann2.C b/gcc/testsuite/g++.old-deja/g++.pt/tiemann2.C
index 31465d8..4c71541 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/tiemann2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/tiemann2.C
@@ -19,7 +19,7 @@ int operator >(const complex& x, const complex &y)
   return c1 > c2;
 }
 
-main ()
+int main ()
 {
   complex c1 (1, 0);
   complex c2 (2, 0);
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/tt2.C b/gcc/testsuite/g++.old-deja/g++.pt/tt2.C
index c4323a5..f6c435b 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/tt2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/tt2.C
@@ -3,7 +3,7 @@
 int f1 () {
   struct A {
     A() : b (2) { }
-    fred () { return b.hi_mom; }
+    int fred () { return b.hi_mom; }
     struct B {
       int hi_mom;
       B (int a) { hi_mom = a; }
@@ -15,7 +15,12 @@ int f1 () {
 }
 
 int f2 () {
-  struct A { ~A() { a = 3; } int a; fred () { return a + 1; } };
+  struct A {
+    ~A() { a = 3; }
+    int a;
+    int fred () { return a + 1; }
+  };
+
   A ab;
   ab.a = 12;
   return ab.fred();
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb44.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb44.C
index 19c4bbf..54eab15 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb44.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb44.C
@@ -27,7 +27,7 @@ ostream& operator<< (ostream& out, const Vector<char>&)
   return out;
 }
 
-main()
+int main()
 {
   Vector<char> vc;
   ostream out;
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb59.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb59.C
index 4bc50b1..7c0c153 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb59.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb59.C
@@ -21,7 +21,7 @@ template<class R> void f( vector<R>& v )
 #endif
 }
 
-main()
+int main()
 {
    vector<int> r;
    f( r );
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb66.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb66.C
index e9a303a..d79865f 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb66.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb66.C
@@ -6,7 +6,7 @@ int bar ()
   throw 100;
 }
 
-main ()
+int main ()
 {
   int i = 0;
   try
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb69.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb69.C
index bd413dd..9cc5f4a 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb69.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb69.C
@@ -6,4 +6,4 @@
                 typedef int an_int;
                 bar() : bar::an_int(3) {};  // will call foo::foo(3)
         };
-        main() { bar b; }
+int main() { bar b; }