aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-03-27 16:44:52 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-03-27 16:44:52 +0000
commita3bdd737e5c5feb3ef7b341fd9f84c5d83d3340b (patch)
tree796c9a33dfe4dcdc09734dbba80b982aad4a9b98
parent36aef0c383bfe285a12b4b826563a768efe181d6 (diff)
downloadnginx-a3bdd737e5c5feb3ef7b341fd9f84c5d83d3340b.tar.gz
nginx-a3bdd737e5c5feb3ef7b341fd9f84c5d83d3340b.zip
Fixed more gcc46 warnings in configure tests.
Steps to reproduce: ./configure --with-cc="gcc46" --with-cc-opt="-Wall -Werror -O2"
-rw-r--r--auto/lib/pcre/conf4
-rw-r--r--auto/os/solaris3
-rw-r--r--auto/types/typedef5
-rw-r--r--auto/types/uintptr_t5
-rwxr-xr-xauto/unix50
5 files changed, 41 insertions, 26 deletions
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index c56848d5d..6a8c326c4 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -98,7 +98,9 @@ else
ngx_feature_incs="#include <pcre.h>"
ngx_feature_path=
ngx_feature_libs="-lpcre"
- ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)"
+ ngx_feature_test="pcre *re;
+ re = pcre_compile(NULL, 0, NULL, 0, NULL);
+ if (re == NULL) return 1"
. auto/feature
if [ $ngx_found = no ]; then
diff --git a/auto/os/solaris b/auto/os/solaris
index 16da4b3fd..d39df0bf7 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -35,7 +35,8 @@ ngx_feature_path=
ngx_feature_libs="-lsendfile"
ngx_feature_test="int fd = 1; sendfilevec_t vec[1];
size_t sent; ssize_t n;
- n = sendfilev(fd, vec, 1, &sent)"
+ n = sendfilev(fd, vec, 1, &sent);
+ if (n == -1) return 1"
. auto/feature
diff --git a/auto/types/typedef b/auto/types/typedef
index 697190097..d81229331 100644
--- a/auto/types/typedef
+++ b/auto/types/typedef
@@ -28,9 +28,8 @@ do
$NGX_INCLUDE_INTTYPES_H
int main() {
- $ngx_try i;
- i = 0;
- return 0;
+ $ngx_try i = 0;
+ return (int) i;
}
END
diff --git a/auto/types/uintptr_t b/auto/types/uintptr_t
index 2a00b493c..2f1908035 100644
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@@ -15,9 +15,8 @@ cat << END > $NGX_AUTOTEST.c
$NGX_INTTYPES_H
int main() {
- uintptr_t i;
- i = 0;
- return 0;
+ uintptr_t i = 0;
+ return (int) i;
}
END
diff --git a/auto/unix b/auto/unix
index 4e1f933a0..a3b95f970 100755
--- a/auto/unix
+++ b/auto/unix
@@ -33,12 +33,12 @@ ngx_feature_run=no
ngx_feature_incs="#include <poll.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="int n, dp; struct pollfd pl;
- dp = 0;
+ngx_feature_test="int n; struct pollfd pl;
pl.fd = 0;
pl.events = 0;
pl.revents = 0;
- n = poll(&pl, 1, 0)"
+ n = poll(&pl, 1, 0);
+ if (n == -1) return 1"
. auto/feature
if [ $ngx_found = no ]; then
@@ -57,7 +57,8 @@ ngx_feature_test="int n, dp; struct dvpoll dvp;
dvp.dp_fds = NULL;
dvp.dp_nfds = 0;
dvp.dp_timeout = 0;
- n = ioctl(dp, DP_POLL, &dvp)"
+ n = ioctl(dp, DP_POLL, &dvp);
+ if (n == -1) return 1"
. auto/feature
if [ $ngx_found = yes ]; then
@@ -357,7 +358,7 @@ ngx_feature_test="socklen_t optlen = sizeof(struct tcp_info);
ti.tcpi_rttvar = 0;
ti.tcpi_snd_cwnd = 0;
ti.tcpi_rcv_space = 0;
- getsockopt(0, IPPROTO_TCP, TCP_INFO, NULL, &optlen)"
+ getsockopt(0, IPPROTO_TCP, TCP_INFO, &ti, &optlen)"
. auto/feature
@@ -512,7 +513,8 @@ ngx_feature_run=no
ngx_feature_incs=
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="char buf[1]; ssize_t n; n = pread(0, buf, 1, 0)"
+ngx_feature_test="char buf[1]; ssize_t n; n = pread(0, buf, 1, 0);
+ if (n == -1) return 1"
. auto/feature
@@ -522,7 +524,8 @@ ngx_feature_run=no
ngx_feature_incs=
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0)"
+ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0);
+ if (n == -1) return 1"
. auto/feature
@@ -596,7 +599,8 @@ ngx_feature_run=no
ngx_feature_incs="#include <stdlib.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="void *p; int n; n = posix_memalign(&p, 4096, 4096)"
+ngx_feature_test="void *p; int n; n = posix_memalign(&p, 4096, 4096);
+ if (n != 0) return 1"
. auto/feature
@@ -607,7 +611,8 @@ ngx_feature_incs="#include <stdlib.h>
#include <malloc.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="void *p; p = memalign(4096, 4096)"
+ngx_feature_test="void *p; p = memalign(4096, 4096);
+ if (p == NULL) return 1"
. auto/feature
@@ -694,10 +699,12 @@ fi
ngx_feature="struct msghdr.msg_control"
ngx_feature_name="NGX_HAVE_MSGHDR_MSG_CONTROL"
ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>"
+ngx_feature_incs="#include <sys/socket.h>
+ #include <stdio.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="struct msghdr msg; msg.msg_control = NULL"
+ngx_feature_test="struct msghdr msg; msg.msg_control = NULL;
+ printf(\"%d\", (int) msg.msg_control)"
. auto/feature
@@ -705,40 +712,47 @@ ngx_feature="ioctl(FIONBIO)"
ngx_feature_name="NGX_HAVE_FIONBIO"
ngx_feature_run=no
ngx_feature_incs="#include <sys/ioctl.h>
+ #include <stdio.h>
$NGX_INCLUDE_SYS_FILIO_H"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="int i; i = FIONBIO"
+ngx_feature_test="int i = FIONBIO; printf(\"%d\", i)"
. auto/feature
ngx_feature="struct tm.tm_gmtoff"
ngx_feature_name="NGX_HAVE_GMTOFF"
ngx_feature_run=no
-ngx_feature_incs="#include <time.h>"
+ngx_feature_incs="#include <time.h>
+ #include <stdio.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="struct tm tm; tm.tm_gmtoff = 0"
+ngx_feature_test="struct tm tm; tm.tm_gmtoff = 0;
+ printf(\"%d\", (int) tm.tm_gmtoff)"
. auto/feature
ngx_feature="struct dirent.d_namlen"
ngx_feature_name="NGX_HAVE_D_NAMLEN"
ngx_feature_run=no
-ngx_feature_incs="#include <dirent.h>"
+ngx_feature_incs="#include <dirent.h>
+ #include <stdio.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="struct dirent dir; dir.d_namlen = 0"
+ngx_feature_test="struct dirent dir; dir.d_namlen = 0;
+ printf(\"%d\", (int) dir.d_namlen)"
. auto/feature
ngx_feature="struct dirent.d_type"
ngx_feature_name="NGX_HAVE_D_TYPE"
ngx_feature_run=no
-ngx_feature_incs="#include <dirent.h>"
+ngx_feature_incs="#include <dirent.h>
+ #include <stdio.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="struct dirent dir; dir.d_type = DT_REG"
+ngx_feature_test="struct dirent dir; dir.d_type = DT_REG;
+ printf(\"%d\", (int) dir.d_type)"
. auto/feature