diff options
Diffstat (limited to 'test cases/linuxlike')
27 files changed, 31 insertions, 33 deletions
diff --git a/test cases/linuxlike/1 pkg-config/meson.build b/test cases/linuxlike/1 pkg-config/meson.build index 87a6e651f..ca48e9bd0 100644 --- a/test cases/linuxlike/1 pkg-config/meson.build +++ b/test cases/linuxlike/1 pkg-config/meson.build @@ -39,7 +39,7 @@ cc = meson.get_compiler('c') zlibdep = cc.find_library('z') code = '''#include<myinc.h> -int main() { +int main(void) { void * something = deflate; if(something != 0) return 0; diff --git a/test cases/linuxlike/1 pkg-config/prog-checkver.c b/test cases/linuxlike/1 pkg-config/prog-checkver.c index 9c5f4f2b0..ea1ed32f4 100644 --- a/test cases/linuxlike/1 pkg-config/prog-checkver.c +++ b/test cases/linuxlike/1 pkg-config/prog-checkver.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <string.h> -int main() { +int main(void) { void * something = deflate; if(strcmp(ZLIB_VERSION, FOUND_ZLIB) != 0) { printf("Meson found '%s' but zlib is '%s'\n", FOUND_ZLIB, ZLIB_VERSION); diff --git a/test cases/linuxlike/1 pkg-config/prog.c b/test cases/linuxlike/1 pkg-config/prog.c index e5774b708..eccc4776f 100644 --- a/test cases/linuxlike/1 pkg-config/prog.c +++ b/test cases/linuxlike/1 pkg-config/prog.c @@ -1,6 +1,6 @@ #include<zlib.h> -int main() { +int main(void) { void * something = deflate; if(something != 0) return 0; diff --git a/test cases/linuxlike/12 subprojects in subprojects/main.c b/test cases/linuxlike/12 subprojects in subprojects/main.c index e4969c348..74523173d 100644 --- a/test cases/linuxlike/12 subprojects in subprojects/main.c +++ b/test cases/linuxlike/12 subprojects in subprojects/main.c @@ -2,7 +2,7 @@ #include "a.h" #include "b.h" -int main() { +int main(void) { int life = a_fun() + b_fun(); printf("%d\n", life); return 0; diff --git a/test cases/linuxlike/12 subprojects in subprojects/subprojects/a/a.c b/test cases/linuxlike/12 subprojects in subprojects/subprojects/a/a.c index cd41a6588..f7dd126fe 100644 --- a/test cases/linuxlike/12 subprojects in subprojects/subprojects/a/a.c +++ b/test cases/linuxlike/12 subprojects in subprojects/subprojects/a/a.c @@ -1,5 +1,5 @@ #include "c.h" -int a_fun() { +int a_fun(void) { return c_fun(); } diff --git a/test cases/linuxlike/12 subprojects in subprojects/subprojects/a/a.h b/test cases/linuxlike/12 subprojects in subprojects/subprojects/a/a.h index 8f1d49eda..9de0deb2c 100644 --- a/test cases/linuxlike/12 subprojects in subprojects/subprojects/a/a.h +++ b/test cases/linuxlike/12 subprojects in subprojects/subprojects/a/a.h @@ -1 +1 @@ -int a_fun(); +int a_fun(void); diff --git a/test cases/linuxlike/12 subprojects in subprojects/subprojects/b/b.c b/test cases/linuxlike/12 subprojects in subprojects/subprojects/b/b.c index 4824285fb..45c9348f7 100644 --- a/test cases/linuxlike/12 subprojects in subprojects/subprojects/b/b.c +++ b/test cases/linuxlike/12 subprojects in subprojects/subprojects/b/b.c @@ -2,7 +2,7 @@ #include "c.h" #endif -int b_fun(){ +int b_fun(void){ #if defined(WITH_C) return c_fun(); #else diff --git a/test cases/linuxlike/12 subprojects in subprojects/subprojects/b/b.h b/test cases/linuxlike/12 subprojects in subprojects/subprojects/b/b.h index eced786a0..47b84d412 100644 --- a/test cases/linuxlike/12 subprojects in subprojects/subprojects/b/b.h +++ b/test cases/linuxlike/12 subprojects in subprojects/subprojects/b/b.h @@ -1 +1 @@ -int b_fun(); +int b_fun(void); diff --git a/test cases/linuxlike/12 subprojects in subprojects/subprojects/c/c.h b/test cases/linuxlike/12 subprojects in subprojects/subprojects/c/c.h index 2b15f607c..b2e3f9b21 100644 --- a/test cases/linuxlike/12 subprojects in subprojects/subprojects/c/c.h +++ b/test cases/linuxlike/12 subprojects in subprojects/subprojects/c/c.h @@ -1,3 +1,3 @@ -static int c_fun(){ +static int c_fun(void){ return 3; } diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build index bae85aa2d..682d6d84f 100644 --- a/test cases/linuxlike/13 cmake dependency/meson.build +++ b/test cases/linuxlike/13 cmake dependency/meson.build @@ -61,7 +61,7 @@ cc = meson.get_compiler('c') zlibdep = cc.find_library('z') code = '''#include<myinc.h> -int main() { +int main(void) { void * something = deflate; if(something != 0) return 0; diff --git a/test cases/linuxlike/13 cmake dependency/prog-checkver.c b/test cases/linuxlike/13 cmake dependency/prog-checkver.c index 9c5f4f2b0..ea1ed32f4 100644 --- a/test cases/linuxlike/13 cmake dependency/prog-checkver.c +++ b/test cases/linuxlike/13 cmake dependency/prog-checkver.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <string.h> -int main() { +int main(void) { void * something = deflate; if(strcmp(ZLIB_VERSION, FOUND_ZLIB) != 0) { printf("Meson found '%s' but zlib is '%s'\n", FOUND_ZLIB, ZLIB_VERSION); diff --git a/test cases/linuxlike/13 cmake dependency/prog.c b/test cases/linuxlike/13 cmake dependency/prog.c index e5774b708..eccc4776f 100644 --- a/test cases/linuxlike/13 cmake dependency/prog.c +++ b/test cases/linuxlike/13 cmake dependency/prog.c @@ -1,6 +1,6 @@ #include<zlib.h> -int main() { +int main(void) { void * something = deflate; if(something != 0) return 0; diff --git a/test cases/linuxlike/13 cmake dependency/testFlagSet.c b/test cases/linuxlike/13 cmake dependency/testFlagSet.c index ec87f5930..1f93ea3a8 100644 --- a/test cases/linuxlike/13 cmake dependency/testFlagSet.c +++ b/test cases/linuxlike/13 cmake dependency/testFlagSet.c @@ -9,7 +9,7 @@ #error "REQUIRED_MESON_FLAG2 not set" #endif -int main() { +int main(void) { printf("Hello World\n"); void * something = deflate; if(something != 0) diff --git a/test cases/linuxlike/14 static dynamic linkage/main.c b/test cases/linuxlike/14 static dynamic linkage/main.c index 628a200c4..09d1509bb 100644 --- a/test cases/linuxlike/14 static dynamic linkage/main.c +++ b/test cases/linuxlike/14 static dynamic linkage/main.c @@ -1,7 +1,7 @@ #include "stdio.h" #include "zlib.h" -int main() { +int main(void) { printf("%s\n", zlibVersion()); return 0; } diff --git a/test cases/linuxlike/2 external library/meson.build b/test cases/linuxlike/2 external library/meson.build index 43070f5f0..fbe661af0 100644 --- a/test cases/linuxlike/2 external library/meson.build +++ b/test cases/linuxlike/2 external library/meson.build @@ -5,14 +5,14 @@ zlib = cc.find_library('z') # Verify that link testing works. linkcode = '''#include<zlib.h> -int main() { +int main(void) { void *ptr = (void*)(deflate); return ptr == 0; } ''' nolinkcode='''int nonexisting(); -int main() { +int main(void) { return nonexisting(); } ''' diff --git a/test cases/linuxlike/2 external library/prog.c b/test cases/linuxlike/2 external library/prog.c index e5774b708..eccc4776f 100644 --- a/test cases/linuxlike/2 external library/prog.c +++ b/test cases/linuxlike/2 external library/prog.c @@ -1,6 +1,6 @@ #include<zlib.h> -int main() { +int main(void) { void * something = deflate; if(something != 0) return 0; diff --git a/test cases/linuxlike/3 linker script/bob.c b/test cases/linuxlike/3 linker script/bob.c index 7b3ed47cb..50e29c753 100644 --- a/test cases/linuxlike/3 linker script/bob.c +++ b/test cases/linuxlike/3 linker script/bob.c @@ -1,9 +1,9 @@ #include"bob.h" -int hiddenFunction() { +int hiddenFunction(void) { return 42; } -int bobMcBob() { +int bobMcBob(void) { return hiddenFunction(); } diff --git a/test cases/linuxlike/3 linker script/bob.h b/test cases/linuxlike/3 linker script/bob.h index b29331e79..351e2fc60 100644 --- a/test cases/linuxlike/3 linker script/bob.h +++ b/test cases/linuxlike/3 linker script/bob.h @@ -1,6 +1,6 @@ #ifndef BOB_H_ #define BOB_H_ -int bobMcBob(); +int bobMcBob(void); #endif diff --git a/test cases/linuxlike/3 linker script/prog.c b/test cases/linuxlike/3 linker script/prog.c index 2c9b01b02..b010b1587 100644 --- a/test cases/linuxlike/3 linker script/prog.c +++ b/test cases/linuxlike/3 linker script/prog.c @@ -1,5 +1,5 @@ #include"bob.h" -int main() { +int main(void) { return bobMcBob() != 42; } diff --git a/test cases/linuxlike/4 extdep static lib/lib.c b/test cases/linuxlike/4 extdep static lib/lib.c index 2f3b3c9a5..bbda9aae7 100644 --- a/test cases/linuxlike/4 extdep static lib/lib.c +++ b/test cases/linuxlike/4 extdep static lib/lib.c @@ -1,6 +1,6 @@ #include<zlib.h> -int statlibfunc() { +int statlibfunc(void) { void * something = deflate; if(something != 0) return 0; diff --git a/test cases/linuxlike/4 extdep static lib/prog.c b/test cases/linuxlike/4 extdep static lib/prog.c index c0268aae9..0aeb8271b 100644 --- a/test cases/linuxlike/4 extdep static lib/prog.c +++ b/test cases/linuxlike/4 extdep static lib/prog.c @@ -1,5 +1,5 @@ -int statlibfunc(); +int statlibfunc(void); -int main() { +int main(void) { return statlibfunc(); } diff --git a/test cases/linuxlike/6 subdir include order/prog.c b/test cases/linuxlike/6 subdir include order/prog.c index 9c8af35c1..2d47a93ae 100644 --- a/test cases/linuxlike/6 subdir include order/prog.c +++ b/test cases/linuxlike/6 subdir include order/prog.c @@ -4,4 +4,4 @@ #error "Failed" #endif -int main() { return 0; } +int main(void) { return 0; } diff --git a/test cases/linuxlike/7 library versions/exe.orig.c b/test cases/linuxlike/7 library versions/exe.orig.c index 7074d2fc9..1e8e90e76 100644 --- a/test cases/linuxlike/7 library versions/exe.orig.c +++ b/test cases/linuxlike/7 library versions/exe.orig.c @@ -1,6 +1,6 @@ int myFunc (void); -int main() +int main(void) { if (myFunc() == 55) return 0; diff --git a/test cases/linuxlike/7 library versions/lib.c b/test cases/linuxlike/7 library versions/lib.c index 67b6f4d00..bd251d777 100644 --- a/test cases/linuxlike/7 library versions/lib.c +++ b/test cases/linuxlike/7 library versions/lib.c @@ -1,3 +1,3 @@ -int myFunc() { +int myFunc(void) { return 55; } diff --git a/test cases/linuxlike/8 subproject library install/subprojects/sublib/include/subdefs.h b/test cases/linuxlike/8 subproject library install/subprojects/sublib/include/subdefs.h index 681c7b890..6ae8462f6 100644 --- a/test cases/linuxlike/8 subproject library install/subprojects/sublib/include/subdefs.h +++ b/test cases/linuxlike/8 subproject library install/subprojects/sublib/include/subdefs.h @@ -16,6 +16,6 @@ #endif #endif -int DLL_PUBLIC subfunc(); +int DLL_PUBLIC subfunc(void); #endif diff --git a/test cases/linuxlike/8 subproject library install/subprojects/sublib/sublib.c b/test cases/linuxlike/8 subproject library install/subprojects/sublib/sublib.c index c13326b85..f71564f14 100644 --- a/test cases/linuxlike/8 subproject library install/subprojects/sublib/sublib.c +++ b/test cases/linuxlike/8 subproject library install/subprojects/sublib/sublib.c @@ -1,5 +1,5 @@ #include<subdefs.h> -int DLL_PUBLIC subfunc() { +int DLL_PUBLIC subfunc(void) { return 42; } diff --git a/test cases/linuxlike/9 compiler checks with dependencies/meson.build b/test cases/linuxlike/9 compiler checks with dependencies/meson.build index 315971ea0..24a9ac048 100644 --- a/test cases/linuxlike/9 compiler checks with dependencies/meson.build +++ b/test cases/linuxlike/9 compiler checks with dependencies/meson.build @@ -10,7 +10,7 @@ if glib.found() assert (cc.has_member('GError', 'message', prefix : '#include <glib.h>', dependencies : glib), 'GError::message not found') assert (cc.has_header_symbol('glib.h', 'gint32', dependencies : glib), 'gint32 symbol not found') linkcode = '''#include <glib.h> -int main () { +int main (void) { GError *error = g_error_new_literal (0, 0, NULL); return error == NULL; } @@ -21,7 +21,7 @@ endif zlib = cc.find_library ('z') if zlib.found() linkcode = '''#include<zlib.h> -int main() { +int main(void) { void *ptr = (void*)(deflate); return ptr == 0; } @@ -34,5 +34,3 @@ assert(cc.has_function('pthread_create', dependencies : dependency('threads'), prefix : '#include <pthread.h>'), 'Could not detect pthread_create with a thread dependency.') - - |