From 0f6ee2a0cffae098d6e1d2dbb8e75f5ed0573fc1 Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy2pow10@gmail.com>
Date: Fri, 24 Aug 2012 22:53:07 +0200
Subject: [PATCH] Issue 1192

---
 waflib/Tools/c_config.py | 9 +++++----
 waflib/Tools/c_tests.py  | 4 ++--
 waflib/Tools/python.py   | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py
index 5100a4a6..8ecfaecb 100644
--- a/waflib/Tools/c_config.py
+++ b/waflib/Tools/c_config.py
@@ -24,7 +24,7 @@ cfg_ver = {
 }
 
 SNIP_FUNCTION = '''
-	int main() {
+	int main(int argc, char **argv) {
 	void *p;
 	p=(void*)(%s);
 	return 0;
@@ -33,21 +33,22 @@ SNIP_FUNCTION = '''
 """Code template for checking for functions"""
 
 SNIP_TYPE = '''
-int main() {
+int main(int argc, char **argv) {
 	if ((%(type_name)s *) 0) return 0;
 	if (sizeof (%(type_name)s)) return 0;
+	return 1;
 }
 '''
 """Code template for checking for types"""
 
 SNIP_EMPTY_PROGRAM = '''
-int main() {
+int main(int argc, char **argv) {
 	return 0;
 }
 '''
 
 SNIP_FIELD = '''
-int main() {
+int main(int argc, char **argv) {
 	char *off;
 	off = (char*) &((%(type_name)s*)0)->%(field_name)s;
 	return (size_t) off < sizeof(%(type_name)s);
diff --git a/waflib/Tools/c_tests.py b/waflib/Tools/c_tests.py
index a2a1d087..f95caf2e 100644
--- a/waflib/Tools/c_tests.py
+++ b/waflib/Tools/c_tests.py
@@ -27,7 +27,7 @@ MAIN_CODE = '''
 #define testEXPORT
 #endif
 testEXPORT int lib_func(void);
-int main(void) {return !(lib_func() == 9);}
+int main(int argc, char **argv) {return !(lib_func() == 9);}
 '''
 
 @feature('link_lib_test')
@@ -123,7 +123,7 @@ def check_inline(self, **kw):
 
 ########################################################################################
 
-LARGE_FRAGMENT = '#include <unistd.h>\nint main() { return !(sizeof(off_t) >= 8); }\n'
+LARGE_FRAGMENT = '#include <unistd.h>\nint main(int argc, char **argv) { return !(sizeof(off_t) >= 8); }\n'
 
 @conf
 def check_large_file(self, **kw):
diff --git a/waflib/Tools/python.py b/waflib/Tools/python.py
index d316589d..35cb842f 100644
--- a/waflib/Tools/python.py
+++ b/waflib/Tools/python.py
@@ -33,7 +33,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-int main()
+int main(int argc, char **argv)
 {
    Py_Initialize();
    Py_Finalize();