Skip to content

Commit

Permalink
Configure: fix build with -Werror=unused-but-set-variable.
Browse files Browse the repository at this point in the history
Signed-off-by: Piotr Sikora <[email protected]>
  • Loading branch information
PiotrSikora committed Jun 27, 2016
1 parent d8a2b25 commit f8c6a08
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 12 deletions.
4 changes: 2 additions & 2 deletions auto/os/darwin
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,6 @@ ngx_feature_run=no
ngx_feature_incs="#include <libkern/OSAtomic.h>"
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="int32_t lock, n;
n = OSAtomicCompareAndSwap32Barrier(0, 1, &lock)"
ngx_feature_test="int32_t lock = 0;
if (!OSAtomicCompareAndSwap32Barrier(0, 1, &lock)) return 1"
. auto/feature
1 change: 1 addition & 0 deletions auto/os/linux
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ ngx_feature_test="int efd = 0;
struct epoll_event ee;
ee.events = EPOLLIN|EPOLLOUT|EPOLLET;
ee.data.ptr = NULL;
(void) ee;
efd = epoll_create(100);
if (efd == -1) return 1;"
. auto/feature
Expand Down
2 changes: 1 addition & 1 deletion auto/os/solaris
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ngx_feature_run=no
ngx_feature_incs="#include <port.h>"
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="int n = port_create()"
ngx_feature_test="(void) port_create()"
. auto/feature

if [ $ngx_found = yes ]; then
Expand Down
22 changes: 13 additions & 9 deletions auto/unix
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
ngx_feature_incs="#include <sys/event.h>"
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="int kq; kq = kqueue()"
ngx_feature_test="(void) kqueue()"
. auto/feature

if [ $ngx_found = yes ]; then
Expand All @@ -92,7 +92,8 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="struct kevent kev;
kev.fflags = NOTE_LOWAT;"
kev.fflags = NOTE_LOWAT;
(void) kev"
. auto/feature


Expand Down Expand Up @@ -492,9 +493,9 @@ if [ $NGX_FILE_AIO = YES ]; then
ngx_feature_incs="#include <aio.h>"
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="int n; struct aiocb iocb;
ngx_feature_test="struct aiocb iocb;
iocb.aio_sigevent.sigev_notify = SIGEV_KEVENT;
n = aio_read(&iocb)"
(void) aio_read(&iocb)"
. auto/feature

if [ $ngx_found = yes ]; then
Expand All @@ -514,6 +515,7 @@ if [ $NGX_FILE_AIO = YES ]; then
iocb.aio_lio_opcode = IOCB_CMD_PREAD;
iocb.aio_flags = IOCB_FLAG_RESFD;
iocb.aio_resfd = -1;
(void) iocb;
(void) eventfd(0, 0)"
. auto/feature

Expand All @@ -529,11 +531,12 @@ if [ $NGX_FILE_AIO = YES ]; then
ngx_feature="Linux AIO support (SYS_eventfd)"
ngx_feature_incs="#include <linux/aio_abi.h>
#include <sys/syscall.h>"
ngx_feature_test="int n = SYS_eventfd;
struct iocb iocb;
ngx_feature_test="struct iocb iocb;
iocb.aio_lio_opcode = IOCB_CMD_PREAD;
iocb.aio_flags = IOCB_FLAG_RESFD;
iocb.aio_resfd = -1;"
iocb.aio_resfd = -1;
(void) iocb;
(void) SYS_eventfd"
. auto/feature

if [ $ngx_found = yes ]; then
Expand Down Expand Up @@ -571,7 +574,7 @@ else

ngx_feature="eventfd() (SYS_eventfd)"
ngx_feature_incs="#include <sys/syscall.h>"
ngx_feature_test="int n = SYS_eventfd"
ngx_feature_test="(void) SYS_eventfd"
. auto/feature
fi
fi
Expand Down Expand Up @@ -644,7 +647,8 @@ if [ $NGX_IPV6 = YES ]; then
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="struct sockaddr_in6 sin6;
sin6.sin6_family = AF_INET6;"
sin6.sin6_family = AF_INET6;
(void) sin6"
. auto/feature
fi

Expand Down

0 comments on commit f8c6a08

Please sign in to comment.