diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 17:07:28 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-08-06 17:07:28 +0000 |
| commit | 20ce4fcbbf7c1504cc520905dfde1b2790011e31 (patch) | |
| tree | 4d719fab466d77fd82c54e29eae01ab84ff70353 /src/os/unix | |
| parent | a24d4d23f770856762a7f3f11f29c0f8b517b1ab (diff) | |
| download | nginx-20ce4fcbbf7c1504cc520905dfde1b2790011e31.tar.gz nginx-20ce4fcbbf7c1504cc520905dfde1b2790011e31.tar.bz2 | |
Merge of r4760, r4761: -Wmissing-prototypes.
Fixed compilation with -Wmissing-prototypes. Added a commented
out -Wmissing-prototypes to CFLAGS. It is commented out to not break
builds with 3rd party modules.
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_atomic.h | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_posix_init.c | 4 | ||||
| -rw-r--r-- | src/os/unix/ngx_solaris_sendfilev_chain.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/os/unix/ngx_atomic.h b/src/os/unix/ngx_atomic.h index 104ac376a..417cd86ff 100644 --- a/src/os/unix/ngx_atomic.h +++ b/src/os/unix/ngx_atomic.h @@ -48,7 +48,9 @@ typedef volatile ngx_atomic_uint_t ngx_atomic_t; #include <libkern/OSAtomic.h> /* "bool" conflicts with perl's CORE/handy.h */ +#if 0 #undef bool +#endif #define NGX_HAVE_ATOMIC_OPS 1 diff --git a/src/os/unix/ngx_posix_init.c b/src/os/unix/ngx_posix_init.c index eea65a903..58e6f7614 100644 --- a/src/os/unix/ngx_posix_init.c +++ b/src/os/unix/ngx_posix_init.c @@ -98,6 +98,8 @@ ngx_os_status(ngx_log_t *log) } +#if 0 + ngx_int_t ngx_posix_post_conf_init(ngx_log_t *log) { @@ -122,3 +124,5 @@ ngx_posix_post_conf_init(ngx_log_t *log) return NGX_OK; } + +#endif diff --git a/src/os/unix/ngx_solaris_sendfilev_chain.c b/src/os/unix/ngx_solaris_sendfilev_chain.c index f800c15f5..520eaaab4 100644 --- a/src/os/unix/ngx_solaris_sendfilev_chain.c +++ b/src/os/unix/ngx_solaris_sendfilev_chain.c @@ -29,6 +29,9 @@ static ssize_t sendfilev(int fd, const struct sendfilevec *vec, return -1; } +ngx_chain_t *ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, + off_t limit); + #endif |