diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 25266c87088a2ee53434789a53c09febb4a2d38c..780d70f29ff04571a2ec0de6db044a97bf02a70a 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-13  Uros Bizjak  <ubizjak@gmail.com>
+
+	* tests/leak_test.c (main): Declare as int.  Return 0.
+	* tests/thread_leak_test.c (main): Ditto.
+	* tests/trace_test.c (main): Ditto.
+
 2010-05-06  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	PR target/42811
diff --git a/boehm-gc/tests/leak_test.c b/boehm-gc/tests/leak_test.c
index 421d0c6cd4a6f9ec5544285a18797c5dc2147b85..bf563ac1c16c0301d94dbfe59cae10774e0ee111 100644
--- a/boehm-gc/tests/leak_test.c
+++ b/boehm-gc/tests/leak_test.c
@@ -1,6 +1,6 @@
 #include "leak_detector.h"
 
-main() {
+int main() {
     int *p[10];
     int i;
     GC_find_leak = 1; /* for new collect versions not compiled  */
@@ -18,4 +18,5 @@ main() {
     CHECK_LEAKS();
     CHECK_LEAKS();
     CHECK_LEAKS();
+    return 0;
 }       
diff --git a/boehm-gc/tests/thread_leak_test.c b/boehm-gc/tests/thread_leak_test.c
index 1174705e45e9b7e81f32737b6bc757a2149126af..eb4cb9bd0184e86e18fa5b345ad58e187a38b240 100644
--- a/boehm-gc/tests/thread_leak_test.c
+++ b/boehm-gc/tests/thread_leak_test.c
@@ -19,7 +19,7 @@ void * test(void * arg) {
 
 #define NTHREADS 5
 
-main() {
+int main() {
     int i;
     pthread_t t[NTHREADS];
     int code;
@@ -37,4 +37,5 @@ main() {
     CHECK_LEAKS();
     CHECK_LEAKS();
     CHECK_LEAKS();
+    return 0;
 }
diff --git a/boehm-gc/tests/trace_test.c b/boehm-gc/tests/trace_test.c
index 870e38723a8dc4aa7dc34abe2ff5d9f7296ff8d3..b84d53ea9676aa7a8b7a1ffe4d1492c8575e9beb 100644
--- a/boehm-gc/tests/trace_test.c
+++ b/boehm-gc/tests/trace_test.c
@@ -16,7 +16,7 @@ struct treenode * mktree(int i) {
   return r;
 }
 
-main()
+int main()
 {
   int i;
   for (i = 0; i < 10; ++i) {
@@ -26,4 +26,5 @@ main()
   GC_generate_random_backtrace();
   GC_generate_random_backtrace();
   GC_generate_random_backtrace();
+  return 0;
 }