Remove unused parameters from test code.

Newer versions of the Android build system have -Wunused-params enabled
by default. Drop the many unused argc/argv parameters from test C/C++
code and also (void) a parameter in a dummy malloc function. This avoids
having to come up with a convoluted way to disable the warning flag in
every test.

BUG=gyp:433
R=thakis@chromium.org

Review URL: https://codereview.chromium.org/316163002

git-svn-id: http://gyp.googlecode.com/svn/trunk@1938 78cadc50-ecff-11dd-a971-7dbc132099af

70 files changed, 71 insertions, 70 deletions

diff --git a/test/actions/src/subdir1/program.c b/test/actions/src/subdir1/program.c
index d5f661d9..c0931534 100644
--- a/test/actions/src/subdir1/program.c
+++ b/test/actions/src/subdir1/program.c
@@ -3,7 +3,7 @@
 extern void prog1(void);

 extern void prog2(void);

 

-int main(int argc, char *argv[])

+int main(void)
 {

   printf("Hello from program.c\n");

   prog1();

diff --git a/test/actions/src/subdir3/generate_main.py b/test/actions/src/subdir3/generate_main.py
index b90b3aa6..804d38df 100755
--- a/test/actions/src/subdir3/generate_main.py
+++ b/test/actions/src/subdir3/generate_main.py
@@ -9,7 +9,7 @@ import sys
 contents = """
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from generate_main.py\\n");
   return 0;
diff --git a/test/assembly/src/program.c b/test/assembly/src/program.c
index ecce3b0b..eee86271 100644
--- a/test/assembly/src/program.c
+++ b/test/assembly/src/program.c
@@ -2,7 +2,7 @@
 
 extern int lib1_function(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   fprintf(stdout, "Hello from program.c\n");
   fflush(stdout);
diff --git a/test/build-option/hello.c b/test/build-option/hello.c
index 78a67b54..f6ad129f 100644
--- a/test/build-option/hello.c
+++ b/test/build-option/hello.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello, world!\n");
   return 0;
diff --git a/test/builddir/src/prog1.c b/test/builddir/src/prog1.c
index 674ca747..a32aaf04 100644
--- a/test/builddir/src/prog1.c
+++ b/test/builddir/src/prog1.c
@@ -2,7 +2,7 @@
 
 extern void func1(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog1.c\n");
   func1();
diff --git a/test/builddir/src/subdir2/prog2.c b/test/builddir/src/subdir2/prog2.c
index bbdf4f06..9d682cd7 100644
--- a/test/builddir/src/subdir2/prog2.c
+++ b/test/builddir/src/subdir2/prog2.c
@@ -2,7 +2,7 @@
 
 extern void func2(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from subdir2/prog2.c\n");
   func2();
diff --git a/test/builddir/src/subdir2/subdir3/prog3.c b/test/builddir/src/subdir2/subdir3/prog3.c
index 10c530b2..da749659 100644
--- a/test/builddir/src/subdir2/subdir3/prog3.c
+++ b/test/builddir/src/subdir2/subdir3/prog3.c
@@ -2,7 +2,7 @@
 
 extern void func3(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from subdir2/subdir3/prog3.c\n");
   func3();
diff --git a/test/builddir/src/subdir2/subdir3/subdir4/prog4.c b/test/builddir/src/subdir2/subdir3/subdir4/prog4.c
index dcba9a9d..5787d5fa 100644
--- a/test/builddir/src/subdir2/subdir3/subdir4/prog4.c
+++ b/test/builddir/src/subdir2/subdir3/subdir4/prog4.c
@@ -2,7 +2,7 @@
 
 extern void func4(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from subdir2/subdir3/subdir4/prog4.c\n");
   func4();
diff --git a/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.c b/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.c
index 69132e57..c6e2ab52 100644
--- a/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.c
+++ b/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.c
@@ -2,7 +2,7 @@
 
 extern void func5(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from subdir2/subdir3/subdir4/subdir5/prog5.c\n");
   func5();
diff --git a/test/cflags/cflags.c b/test/cflags/cflags.c
index 276abe64..0a02ba90 100644
--- a/test/cflags/cflags.c
+++ b/test/cflags/cflags.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
 #ifdef FOO
   printf("FOO defined\n");
diff --git a/test/compilable/src/program.cpp b/test/compilable/src/program.cpp
index 81420bad..8af2c9b6 100644
--- a/test/compilable/src/program.cpp
+++ b/test/compilable/src/program.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include "lib1.hpp"
 
-int main(int argc, char *argv[]) {
+int main(void) {
   fprintf(stdout, "Hello from program.c\n");
   fflush(stdout);
   lib1_function();
diff --git a/test/configurations/basics/configurations.c b/test/configurations/basics/configurations.c
index 6c1f9001..39e13c9c 100644
--- a/test/configurations/basics/configurations.c
+++ b/test/configurations/basics/configurations.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
 #ifdef FOO
   printf("Foo configuration\n");
diff --git a/test/configurations/inheritance/configurations.c b/test/configurations/inheritance/configurations.c
index 2d5565ee..ebb9f845 100644
--- a/test/configurations/inheritance/configurations.c
+++ b/test/configurations/inheritance/configurations.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
 #ifdef BASE
   printf("Base configuration\n");
diff --git a/test/configurations/target_platform/front.c b/test/configurations/target_platform/front.c
index 12b1d0aa..7a91689f 100644
--- a/test/configurations/target_platform/front.c
+++ b/test/configurations/target_platform/front.c
@@ -2,7 +2,7 @@
 
 const char *message(void);
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("%s\n", message());
   return 0;
 }
diff --git a/test/configurations/x64/configurations.c b/test/configurations/x64/configurations.c
index 72c97e31..37018438 100644
--- a/test/configurations/x64/configurations.c
+++ b/test/configurations/x64/configurations.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[]) {
+int main(void) {
   if (sizeof(void*) == 4) {
     printf("Running Win32\n");
   } else if (sizeof(void*) == 8) {
diff --git a/test/cxxflags/cxxflags.cc b/test/cxxflags/cxxflags.cc
index 44b299c7..e70e39df 100644
--- a/test/cxxflags/cxxflags.cc
+++ b/test/cxxflags/cxxflags.cc
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
 #ifdef ABC
   printf("With define\n");
diff --git a/test/defines-escaping/defines-escaping.c b/test/defines-escaping/defines-escaping.c
index 44075722..a0aa4c28 100644
--- a/test/defines-escaping/defines-escaping.c
+++ b/test/defines-escaping/defines-escaping.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf(TEST_FORMAT, TEST_ARGS);
   return 0;
diff --git a/test/defines/defines.c b/test/defines/defines.c
index e0ef5212..dda13927 100644
--- a/test/defines/defines.c
+++ b/test/defines/defines.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
 #ifdef FOO
   printf("FOO is defined\n");
diff --git a/test/dependency-copy/src/file1.c b/test/dependency-copy/src/file1.c
index 3caf5d63..d7c31591 100644
--- a/test/dependency-copy/src/file1.c
+++ b/test/dependency-copy/src/file1.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from file1.c\n");
   return 0;
diff --git a/test/dependency-copy/src/file2.c b/test/dependency-copy/src/file2.c
index ed45cc01..cf40f57f 100644
--- a/test/dependency-copy/src/file2.c
+++ b/test/dependency-copy/src/file2.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from file2.c\n");
   return 0;
diff --git a/test/exclusion/hello.c b/test/exclusion/hello.c
index 30e8d541..6e7dc8e4 100644
--- a/test/exclusion/hello.c
+++ b/test/exclusion/hello.c
@@ -8,7 +8,7 @@ int func1(void) {
   return 42;
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello, world!\n");
   printf("%d\n", func1());
   return 0;
diff --git a/test/external-cross-compile/src/program.cc b/test/external-cross-compile/src/program.cc
index a50ca367..5172ae90 100644
--- a/test/external-cross-compile/src/program.cc
+++ b/test/external-cross-compile/src/program.cc
@@ -10,7 +10,7 @@ static char data[] = {
 #include "cross_program.h"
 };
 
-int main(int argc, char *argv[]) {
+int main(void) {
   fwrite(data, 1, sizeof(data), stdout);
   return 0;
 }
diff --git a/test/generator-output/actions/subdir1/program.c b/test/generator-output/actions/subdir1/program.c
index d5f661d9..c0931534 100644
--- a/test/generator-output/actions/subdir1/program.c
+++ b/test/generator-output/actions/subdir1/program.c
@@ -3,7 +3,7 @@
 extern void prog1(void);

 extern void prog2(void);

 

-int main(int argc, char *argv[])

+int main(void)
 {

   printf("Hello from program.c\n");

   prog1();

diff --git a/test/generator-output/rules/subdir1/program.c b/test/generator-output/rules/subdir1/program.c
index 27fd31ed..56b32063 100644
--- a/test/generator-output/rules/subdir1/program.c
+++ b/test/generator-output/rules/subdir1/program.c
@@ -7,7 +7,7 @@ extern void function2(void);
 extern void function3(void);
 extern void function4(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from program.c\n");
   function1();
diff --git a/test/generator-output/src/prog1.c b/test/generator-output/src/prog1.c
index 656f81d5..bf7c2a17 100644
--- a/test/generator-output/src/prog1.c
+++ b/test/generator-output/src/prog1.c
@@ -6,7 +6,7 @@
 #include "include3.h"
 #include "deeper.h"
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog1.c\n");
   printf("Hello from %s\n", INC_STRING);
diff --git a/test/generator-output/src/subdir2/deeper/deeper.c b/test/generator-output/src/subdir2/deeper/deeper.c
index 56c49d1f..843505cd 100644
--- a/test/generator-output/src/subdir2/deeper/deeper.c
+++ b/test/generator-output/src/subdir2/deeper/deeper.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from deeper.c\n");
   return 0;
diff --git a/test/generator-output/src/subdir2/prog2.c b/test/generator-output/src/subdir2/prog2.c
index 38d6c84d..d80d8719 100644
--- a/test/generator-output/src/subdir2/prog2.c
+++ b/test/generator-output/src/subdir2/prog2.c
@@ -6,7 +6,7 @@
 #include "include3.h"
 #include "deeper.h"
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog2.c\n");
   printf("Hello from %s\n", INC_STRING);
diff --git a/test/generator-output/src/subdir3/prog3.c b/test/generator-output/src/subdir3/prog3.c
index 7848b45a..c72233da 100644
--- a/test/generator-output/src/subdir3/prog3.c
+++ b/test/generator-output/src/subdir3/prog3.c
@@ -6,7 +6,7 @@
 #include "include3.h"
 #include "deeper.h"
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog3.c\n");
   printf("Hello from %s\n", INC_STRING);
diff --git a/test/hello/hello.c b/test/hello/hello.c
index 8dbecc04..0a4c8060 100644
--- a/test/hello/hello.c
+++ b/test/hello/hello.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello, world!\n");
   return 0;
diff --git a/test/hello/hello2.c b/test/hello/hello2.c
index 19ef3fbd..b14299ca 100644
--- a/test/hello/hello2.c
+++ b/test/hello/hello2.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello, two!\n");
   return 0;
diff --git a/test/home_dot_gyp/src/printfoo.c b/test/home_dot_gyp/src/printfoo.c
index 92d2cbac..9bb67181 100644
--- a/test/home_dot_gyp/src/printfoo.c
+++ b/test/home_dot_gyp/src/printfoo.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("FOO is %s\n", FOO);
   return 0;
diff --git a/test/include_dirs/src/includes.c b/test/include_dirs/src/includes.c
index e2afbd3e..6e2a23cd 100644
--- a/test/include_dirs/src/includes.c
+++ b/test/include_dirs/src/includes.c
@@ -5,7 +5,7 @@
 #include "include2.h"
 #include "shadow.h"
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from includes.c\n");
   printf("Hello from %s\n", INC_STRING);
diff --git a/test/include_dirs/src/subdir/subdir_includes.c b/test/include_dirs/src/subdir/subdir_includes.c
index 727f6822..4623543c 100644
--- a/test/include_dirs/src/subdir/subdir_includes.c
+++ b/test/include_dirs/src/subdir/subdir_includes.c
@@ -4,7 +4,7 @@
 #include "include1.h"
 #include "include2.h"
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from subdir/subdir_includes.c\n");
   printf("Hello from %s\n", INC_STRING);
diff --git a/test/library/src/program.c b/test/library/src/program.c
index d7712cce..d460f60e 100644
--- a/test/library/src/program.c
+++ b/test/library/src/program.c
@@ -4,7 +4,7 @@ extern void lib1_function(void);
 extern void lib2_function(void);
 extern void moveable_function(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   fprintf(stdout, "Hello from program.c\n");
   fflush(stdout);
diff --git a/test/link-dependency/mymalloc.c b/test/link-dependency/mymalloc.c
index 23d034f9..f80bc02a 100644
--- a/test/link-dependency/mymalloc.c
+++ b/test/link-dependency/mymalloc.c
@@ -7,5 +7,6 @@ __declspec(dllexport) void foo() {}
 #endif
 
 void *malloc(size_t size) {
+  (void)size;
   return (void*)0xdeadbeef;
 }
diff --git a/test/link-objects/base.c b/test/link-objects/base.c
index 2bc29a1b..33274592 100644
--- a/test/link-objects/base.c
+++ b/test/link-objects/base.c
@@ -1,6 +1,6 @@
 void extra();
 
-int main(int argc, char** argv) {
+int main(void) {
   extra();
   return 0;
 }
diff --git a/test/make/main.cc b/test/make/main.cc
index 70ac6e46..3b9a705c 100644
--- a/test/make/main.cc
+++ b/test/make/main.cc
@@ -6,7 +6,7 @@
 
 #include "main.h"
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("hello world\n");
   return 0;
 }
diff --git a/test/make/noload/main.c b/test/make/noload/main.c
index 46d3c52c..26ec1889 100644
--- a/test/make/noload/main.c
+++ b/test/make/noload/main.c
@@ -2,7 +2,7 @@
 
 #include "lib/shared.h"
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from %s.\n", kSharedStr);
   return 0;
diff --git a/test/msvs/config_attrs/hello.c b/test/msvs/config_attrs/hello.c
index 5a8072db..faadc75e 100644
--- a/test/msvs/config_attrs/hello.c
+++ b/test/msvs/config_attrs/hello.c
@@ -4,8 +4,8 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello, world!\n");
   return 0;
-}
\ No newline at end of file
+}
diff --git a/test/msvs/external_builder/hello.cpp b/test/msvs/external_builder/hello.cpp
index 69acc38b..bc0c0265 100644
--- a/test/msvs/external_builder/hello.cpp
+++ b/test/msvs/external_builder/hello.cpp
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello, world!\n");
   return 0;
 }
diff --git a/test/msvs/list_excluded/hello.cpp b/test/msvs/list_excluded/hello.cpp
index 69acc38b..bc0c0265 100644
--- a/test/msvs/list_excluded/hello.cpp
+++ b/test/msvs/list_excluded/hello.cpp
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello, world!\n");
   return 0;
 }
diff --git a/test/msvs/props/hello.c b/test/msvs/props/hello.c
index b41318dc..faadc75e 100644
--- a/test/msvs/props/hello.c
+++ b/test/msvs/props/hello.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello, world!\n");
   return 0;
diff --git a/test/msvs/shared_output/hello.c b/test/msvs/shared_output/hello.c
index 44d1b0dc..698e4fd3 100644
--- a/test/msvs/shared_output/hello.c
+++ b/test/msvs/shared_output/hello.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello, world!\n");
   return 0;
 }
diff --git a/test/msvs/shared_output/there/there.c b/test/msvs/shared_output/there/there.c
index 44d1b0dc..698e4fd3 100644
--- a/test/msvs/shared_output/there/there.c
+++ b/test/msvs/shared_output/there/there.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello, world!\n");
   return 0;
 }
diff --git a/test/msvs/uldi2010/hello.c b/test/msvs/uldi2010/hello.c
index 27690936..06e6a029 100644
--- a/test/msvs/uldi2010/hello.c
+++ b/test/msvs/uldi2010/hello.c
@@ -6,7 +6,7 @@
 
 extern int hello2();
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello, world!\n");
   hello2();
   return 0;
diff --git a/test/multiple-targets/src/prog1.c b/test/multiple-targets/src/prog1.c
index d55f8af1..fbf8d4cd 100644
--- a/test/multiple-targets/src/prog1.c
+++ b/test/multiple-targets/src/prog1.c
@@ -2,7 +2,7 @@
 
 extern void common(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("hello from prog1.c\n");
   common();
diff --git a/test/multiple-targets/src/prog2.c b/test/multiple-targets/src/prog2.c
index 760590eb..a94b5c15 100644
--- a/test/multiple-targets/src/prog2.c
+++ b/test/multiple-targets/src/prog2.c
@@ -2,7 +2,7 @@
 
 extern void common(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("hello from prog2.c\n");
   common();
diff --git a/test/ninja/chained-dependency/chained.c b/test/ninja/chained-dependency/chained.c
index e4eb5e86..c1ff1a7b 100644
--- a/test/ninja/chained-dependency/chained.c
+++ b/test/ninja/chained-dependency/chained.c
@@ -1,5 +1,5 @@
 #include "generated/header.h"
 
-int main(int argc, char** argv) {
+int main(void) {
   return 0;
 }
diff --git a/test/product/hello.c b/test/product/hello.c
index 94798f3e..41fdff0e 100644
--- a/test/product/hello.c
+++ b/test/product/hello.c
@@ -8,7 +8,7 @@ int func1(void) {
   return 42;
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello, world!\n");
   printf("%d\n", func1());
   return 0;
diff --git a/test/rules-rebuild/src/main.c b/test/rules-rebuild/src/main.c
index bdc5ec87..bd8fbb20 100644
--- a/test/rules-rebuild/src/main.c
+++ b/test/rules-rebuild/src/main.c
@@ -3,7 +3,7 @@
 extern void prog1(void);
 extern void prog2(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from main.c\n");
   prog1();
diff --git a/test/rules/src/subdir1/program.c b/test/rules/src/subdir1/program.c
index 258d7f99..6b11ff9f 100644
--- a/test/rules/src/subdir1/program.c
+++ b/test/rules/src/subdir1/program.c
@@ -3,7 +3,7 @@
 extern void function1(void);
 extern void function2(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from program.c\n");
   function1();
diff --git a/test/rules/src/subdir2/program.c b/test/rules/src/subdir2/program.c
index c9ae7cd5..e5db1751 100644
--- a/test/rules/src/subdir2/program.c
+++ b/test/rules/src/subdir2/program.c
@@ -5,7 +5,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from program.c\n");
   return 0;
diff --git a/test/rules/src/subdir3/program.c b/test/rules/src/subdir3/program.c
index 94f6c509..c38eead5 100644
--- a/test/rules/src/subdir3/program.c
+++ b/test/rules/src/subdir3/program.c
@@ -2,7 +2,7 @@
 
 extern void function3(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from program.c\n");
   function3();
diff --git a/test/rules/src/subdir4/program.c b/test/rules/src/subdir4/program.c
index 42475906..ad647f4e 100644
--- a/test/rules/src/subdir4/program.c
+++ b/test/rules/src/subdir4/program.c
@@ -9,7 +9,7 @@ int asm_function() {
 }
 #endif
 
-int main(int argc, char *argv[])
+int main(void)
 {
   fprintf(stdout, "Hello from program.c\n");
   fflush(stdout);
diff --git a/test/same-source-file-name/src/prog1.c b/test/same-source-file-name/src/prog1.c
index c8940fed..604e2b9c 100644
--- a/test/same-source-file-name/src/prog1.c
+++ b/test/same-source-file-name/src/prog1.c
@@ -2,7 +2,7 @@
 
 extern void func(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog1.c\n");
   func();
diff --git a/test/same-source-file-name/src/prog2.c b/test/same-source-file-name/src/prog2.c
index e6605c2b..466ee350 100644
--- a/test/same-source-file-name/src/prog2.c
+++ b/test/same-source-file-name/src/prog2.c
@@ -2,7 +2,7 @@
 
 extern void func(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog2.c\n");
   func();
diff --git a/test/same-source-file-name/src/prog3.c b/test/same-source-file-name/src/prog3.c
index a162a983..34d495ce 100644
--- a/test/same-source-file-name/src/prog3.c
+++ b/test/same-source-file-name/src/prog3.c
@@ -8,7 +8,7 @@ extern void func(void);
 extern void subdir1_func(void);
 extern void subdir2_func(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog3.c\n");
   func();
diff --git a/test/sibling/src/prog1/prog1.c b/test/sibling/src/prog1/prog1.c
index 161ae8a3..218e9940 100644
--- a/test/sibling/src/prog1/prog1.c
+++ b/test/sibling/src/prog1/prog1.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog1.c\n");
   return 0;
diff --git a/test/sibling/src/prog2/prog2.c b/test/sibling/src/prog2/prog2.c
index 7635ae8c..12a31883 100644
--- a/test/sibling/src/prog2/prog2.c
+++ b/test/sibling/src/prog2/prog2.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog2.c\n");
   return 0;
diff --git a/test/standalone-static-library/prog.c b/test/standalone-static-library/prog.c
index dc12b689..8af5c908 100644
--- a/test/standalone-static-library/prog.c
+++ b/test/standalone-static-library/prog.c
@@ -1,6 +1,6 @@
 extern void print(void);
 
-int main(int argc, char *argv[])
+int main(void)
 {
   print();
   return 0;
diff --git a/test/subdirectory/src/prog1.c b/test/subdirectory/src/prog1.c
index 161ae8a3..218e9940 100644
--- a/test/subdirectory/src/prog1.c
+++ b/test/subdirectory/src/prog1.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog1.c\n");
   return 0;
diff --git a/test/subdirectory/src/subdir/prog2.c b/test/subdirectory/src/subdir/prog2.c
index 7635ae8c..12a31883 100644
--- a/test/subdirectory/src/subdir/prog2.c
+++ b/test/subdirectory/src/subdir/prog2.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog2.c\n");
   return 0;
diff --git a/test/subdirectory/src/subdir/subdir2/prog3.c b/test/subdirectory/src/subdir/subdir2/prog3.c
index 7cfb0fa9..a326dc61 100644
--- a/test/subdirectory/src/subdir/subdir2/prog3.c
+++ b/test/subdirectory/src/subdir/subdir2/prog3.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog3.c\n");
   return 0;
diff --git a/test/toolsets/main.cc b/test/toolsets/main.cc
index 4904a16f..bc47da99 100644
--- a/test/toolsets/main.cc
+++ b/test/toolsets/main.cc
@@ -7,7 +7,7 @@
 const char *GetToolset();
 const char *GetToolsetShared();
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("%s\n", GetToolset());
   printf("Shared: %s\n", GetToolsetShared());
 }
diff --git a/test/toplevel-dir/src/sub1/prog1.c b/test/toplevel-dir/src/sub1/prog1.c
index 161ae8a3..218e9940 100644
--- a/test/toplevel-dir/src/sub1/prog1.c
+++ b/test/toplevel-dir/src/sub1/prog1.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog1.c\n");
   return 0;
diff --git a/test/toplevel-dir/src/sub2/prog2.c b/test/toplevel-dir/src/sub2/prog2.c
index 7635ae8c..12a31883 100644
--- a/test/toplevel-dir/src/sub2/prog2.c
+++ b/test/toplevel-dir/src/sub2/prog2.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-int main(int argc, char *argv[])
+int main(void)
 {
   printf("Hello from prog2.c\n");
   return 0;
diff --git a/test/variables/latelate/src/program.cc b/test/variables/latelate/src/program.cc
index 4c6d6e04..97c98ae5 100644
--- a/test/variables/latelate/src/program.cc
+++ b/test/variables/latelate/src/program.cc
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf(FOO "\n");
   return 0;
 }
diff --git a/test/win/generator-output-different-drive/prog.c b/test/win/generator-output-different-drive/prog.c
index 2f855c43..7937f5d0 100644
--- a/test/win/generator-output-different-drive/prog.c
+++ b/test/win/generator-output-different-drive/prog.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello from prog.c\n");
   return 0;
 }
diff --git a/test/win/large-pdb/main.cc b/test/win/large-pdb/main.cc
index adf7120d..c3da8e92 100644
--- a/test/win/large-pdb/main.cc
+++ b/test/win/large-pdb/main.cc
@@ -2,6 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-int main(int argc, const char** argv) {
+int main(void) {
   return 0;
 }
diff --git a/test/win/precompiled/hello.c b/test/win/precompiled/hello.c
index d1abbb9e..ffb47bf8 100644
--- a/test/win/precompiled/hello.c
+++ b/test/win/precompiled/hello.c
@@ -7,7 +7,7 @@
 
 extern int hello2();
 
-int main(int argc, char *argv[]) {
+int main(void) {
   printf("Hello, world!\n");
   hello2();
   return 0;