Merge pull request microsoft#1 from majnemer/int-main

russellhadley · russellhadley · commit b269fb3e13fc · 2015-08-24T06:51:00.000-07:00
Replace 'void main' with 'int main'.
diff --git a/eh/ihateeh.cxx b/eh/ihateeh.cxx
@@ -164,7 +164,7 @@ A test() {
   return a1 + A() + a2 + A() + a3 + a4;
 }
 
-void main() {
+int main() {
   int i;
 
   /* Call test(), with a different ctor/dtor throwing each time */
diff --git a/seh/xcpt4u.c b/seh/xcpt4u.c
@@ -923,7 +923,7 @@ VOID Test88(_Inout_ PLONG Counter)
   finally { *Counter += 1; }
 }
 
-VOID main(int argc, char *argv[])
+int main(int argc, char *argv[])
 
 {
 

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ A test() {`
`164`	`164`	`return a1 + A() + a2 + A() + a3 + a4;`
`165`	`165`	`}`
`166`	`166`
`167`		`-void main() {`
	`167`	`+int main() {`
`168`	`168`	`int i;`
`169`	`169`
`170`	`170`	`/* Call test(), with a different ctor/dtor throwing each time */`
Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,7 @@ VOID Test88(_Inout_ PLONG Counter)`
`923`	`923`	`finally { *Counter += 1; }`
`924`	`924`	`}`
`925`	`925`
`926`		`-VOID main(int argc, char *argv[])`
	`926`	`+int main(int argc, char *argv[])`
`927`	`927`
`928`	`928`	`{`
`929`	`929`