diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-12-17 15:54:39 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2017-12-17 18:56:38 +0100 |
| commit | 80a5172acd1d75b35727132a95151c9ecbbe6899 (patch) | |
| tree | 6a6d0ce1244d00d29c429a42634ccfe51388ad9a | |
| parent | 6cd160fe5c96559a7c388647244f8cfa16426b3d (diff) | |
| download | PROJ-80a5172acd1d75b35727132a95151c9ecbbe6899.tar.gz PROJ-80a5172acd1d75b35727132a95151c9ecbbe6899.zip | |
Add -std=c89 to travis targets.
The multistresstest code has been made C89 compliant in the process.
| -rw-r--r-- | src/multistresstest.c | 3 | ||||
| -rwxr-xr-x | travis/linux_clang/install.sh | 2 | ||||
| -rwxr-xr-x | travis/linux_gcc/install.sh | 2 | ||||
| -rwxr-xr-x | travis/osx/install.sh | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/multistresstest.c b/src/multistresstest.c index c9c11c6d..8e7517ec 100644 --- a/src/multistresstest.c +++ b/src/multistresstest.c @@ -161,7 +161,7 @@ TestItem test_list[] = { 0, 0 }, { - //Bad projection (invalid ellipsoid parameter +R_A=0) + /* Bad projection (invalid ellipsoid parameter +R_A=0) */ "+proj=utm +zone=11 +datum=WGS84", "+proj=merc +datum=potsdam +R_A=0", 150000.0, 3000000.0, 0.0, @@ -201,7 +201,6 @@ static void TestThread() /* -------------------------------------------------------------------- */ projPJ *src_pj_list, *dst_pj_list; projCtx ctx = pj_ctx_alloc(); -// projCtx ctx = pj_get_default_ctx(); src_pj_list = (projPJ *) calloc(test_count,sizeof(projPJ)); dst_pj_list = (projPJ *) calloc(test_count,sizeof(projPJ)); diff --git a/travis/linux_clang/install.sh b/travis/linux_clang/install.sh index a0dd9353..cacb3f85 100755 --- a/travis/linux_clang/install.sh +++ b/travis/linux_clang/install.sh @@ -4,4 +4,4 @@ set -e export CCACHE_CPP2=yes -CC="ccache clang" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -fsanitize=address -O2" ./travis/install.sh +CC="ccache clang" CFLAGS="-std=c89 -g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -fsanitize=address -O2" ./travis/install.sh diff --git a/travis/linux_gcc/install.sh b/travis/linux_gcc/install.sh index 571e02b7..6910322c 100755 --- a/travis/linux_gcc/install.sh +++ b/travis/linux_gcc/install.sh @@ -5,4 +5,4 @@ set -e export CCACHE_CPP2=yes # -Wfloat-conversion not available for gcc 4.8 -CC="ccache gcc" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -O2" ./travis/install.sh +CC="ccache gcc" CFLAGS="-std=c89 -g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -O2" ./travis/install.sh diff --git a/travis/osx/install.sh b/travis/osx/install.sh index 56e16ce6..8c25e1f1 100755 --- a/travis/osx/install.sh +++ b/travis/osx/install.sh @@ -4,4 +4,4 @@ set -e export CCACHE_CPP2=yes -CC="ccache clang" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -O2" ./travis/install.sh +CC="ccache clang" CFLAGS="-std=c89 -g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -O2" ./travis/install.sh |