Mercurial > hg > nginx
changeset 4798:29928279ec9f stable-1.2
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 06 Aug 2012 17:07:28 +0000 |
parents | d1cea70248c7 |
children | 24f2b8495f7d |
files | auto/cc/gcc src/core/ngx_conf_file.c src/core/ngx_crypt.c src/event/modules/ngx_epoll_module.c src/event/modules/ngx_eventport_module.c src/event/modules/ngx_rtsig_module.c src/event/ngx_event.c src/http/modules/ngx_http_log_module.c src/http/modules/ngx_http_upstream_least_conn_module.c src/http/ngx_http_parse_time.c src/mail/ngx_mail_parse.c src/misc/ngx_cpp_test_module.cpp src/os/unix/ngx_atomic.h src/os/unix/ngx_posix_init.c src/os/unix/ngx_solaris_sendfilev_chain.c |
diffstat | 15 files changed, 76 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/cc/gcc Mon Aug 06 17:03:01 2012 +0000 +++ b/auto/cc/gcc Mon Aug 06 17:07:28 2012 +0000 @@ -149,6 +149,7 @@ CFLAGS="$CFLAGS -Wall -Wpointer-arith" #CFLAGS="$CFLAGS -Wconversion" #CFLAGS="$CFLAGS -Winline" +#CFLAGS="$CFLAGS -Wmissing-prototypes" case "$NGX_GCC_VER" in
--- a/src/core/ngx_conf_file.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/core/ngx_conf_file.c Mon Aug 06 17:07:28 2012 +0000 @@ -1448,12 +1448,16 @@ } +#if 0 + char * ngx_conf_unsupported(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) { return "unsupported on this platform"; } +#endif + char * ngx_conf_deprecated(ngx_conf_t *cf, void *post, void *data)
--- a/src/core/ngx_crypt.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/core/ngx_crypt.c Mon Aug 06 17:07:28 2012 +0000 @@ -6,6 +6,7 @@ #include <ngx_config.h> #include <ngx_core.h> +#include <ngx_crypt.h> #include <ngx_md5.h> #if (NGX_HAVE_SHA1) #include <ngx_sha1.h>
--- a/src/event/modules/ngx_epoll_module.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/event/modules/ngx_epoll_module.c Mon Aug 06 17:07:28 2012 +0000 @@ -44,16 +44,25 @@ epoll_data_t data; }; + +int epoll_create(int size); + int epoll_create(int size) { return -1; } + +int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event); + int epoll_ctl(int epfd, int op, int fd, struct epoll_event *event) { return -1; } + +int epoll_wait(int epfd, struct epoll_event *events, int nevents, int timeout); + int epoll_wait(int epfd, struct epoll_event *events, int nevents, int timeout) { return -1; @@ -76,11 +85,6 @@ }; -int eventfd(u_int initval) -{ - return -1; -} - #endif #endif
--- a/src/event/modules/ngx_eventport_module.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/event/modules/ngx_eventport_module.c Mon Aug 06 17:07:28 2012 +0000 @@ -15,6 +15,12 @@ #define ushort_t u_short #define uint_t u_int +#ifndef CLOCK_REALTIME +#define CLOCK_REALTIME 0 +typedef int clockid_t; +typedef void * timer_t; +#endif + /* Solaris declarations */ #define PORT_SOURCE_AIO 1 @@ -24,7 +30,9 @@ #define PORT_SOURCE_ALERT 5 #define PORT_SOURCE_MQ 6 +#ifndef ETIME #define ETIME 64 +#endif #define SIGEV_PORT 4 @@ -50,39 +58,62 @@ #endif +int port_create(void); + int port_create(void) { return -1; } + +int port_associate(int port, int source, uintptr_t object, int events, + void *user); + int port_associate(int port, int source, uintptr_t object, int events, void *user) { return -1; } + +int port_dissociate(int port, int source, uintptr_t object); + int port_dissociate(int port, int source, uintptr_t object) { return -1; } + +int port_getn(int port, port_event_t list[], uint_t max, uint_t *nget, + struct timespec *timeout); + int port_getn(int port, port_event_t list[], uint_t max, uint_t *nget, struct timespec *timeout) { return -1; } + +int timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid); + int timer_create(clockid_t clock_id, struct sigevent *evp, timer_t *timerid) { return -1; } + +int timer_settime(timer_t timerid, int flags, const struct itimerspec *value, + struct itimerspec *ovalue); + int timer_settime(timer_t timerid, int flags, const struct itimerspec *value, struct itimerspec *ovalue) { return -1; } + +int timer_delete(timer_t timerid); + int timer_delete(timer_t timerid) { return -1;
--- a/src/event/modules/ngx_rtsig_module.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/event/modules/ngx_rtsig_module.c Mon Aug 06 17:07:28 2012 +0000 @@ -12,6 +12,13 @@ #if (NGX_TEST_BUILD_RTSIG) +#if (NGX_DARWIN) + +#define SIGRTMIN 33 +#define si_fd __pad[0] + +#else + #ifdef SIGRTMIN #define si_fd _reason.__spare__.__spare2__[0] #else @@ -19,11 +26,16 @@ #define si_fd __spare__[0] #endif +#endif + #define F_SETSIG 10 #define KERN_RTSIGNR 30 #define KERN_RTSIGMAX 31 int sigtimedwait(const sigset_t *set, siginfo_t *info, + const struct timespec *timeout); + +int sigtimedwait(const sigset_t *set, siginfo_t *info, const struct timespec *timeout) { return -1;
--- a/src/event/ngx_event.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/event/ngx_event.c Mon Aug 06 17:07:28 2012 +0000 @@ -567,7 +567,7 @@ #if !(NGX_WIN32) -void +static void ngx_timer_signal_handler(int signo) { ngx_event_timer_alarm = 1;
--- a/src/http/modules/ngx_http_log_module.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/http/modules/ngx_http_log_module.c Mon Aug 06 17:07:28 2012 +0000 @@ -218,7 +218,7 @@ }; -ngx_int_t +static ngx_int_t ngx_http_log_handler(ngx_http_request_t *r) { u_char *line, *p;
--- a/src/http/modules/ngx_http_upstream_least_conn_module.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/http/modules/ngx_http_upstream_least_conn_module.c Mon Aug 06 17:07:28 2012 +0000 @@ -81,7 +81,7 @@ }; -ngx_int_t +static ngx_int_t ngx_http_upstream_init_least_conn(ngx_conf_t *cf, ngx_http_upstream_srv_conf_t *us) {
--- a/src/http/ngx_http_parse_time.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/http/ngx_http_parse_time.c Mon Aug 06 17:07:28 2012 +0000 @@ -7,6 +7,7 @@ #include <ngx_config.h> #include <ngx_core.h> +#include <ngx_http.h> static ngx_uint_t mday[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
--- a/src/mail/ngx_mail_parse.c Mon Aug 06 17:03:01 2012 +0000 +++ b/src/mail/ngx_mail_parse.c Mon Aug 06 17:07:28 2012 +0000 @@ -9,6 +9,9 @@ #include <ngx_core.h> #include <ngx_event.h> #include <ngx_mail.h> +#include <ngx_mail_pop3_module.h> +#include <ngx_mail_imap_module.h> +#include <ngx_mail_smtp_module.h> ngx_int_t
--- a/src/misc/ngx_cpp_test_module.cpp Mon Aug 06 17:03:01 2012 +0000 +++ b/src/misc/ngx_cpp_test_module.cpp Mon Aug 06 17:07:28 2012 +0000 @@ -20,6 +20,8 @@ // #include <string> +void ngx_cpp_test_handler(void *data); + void ngx_cpp_test_handler(void *data) {
--- a/src/os/unix/ngx_atomic.h Mon Aug 06 17:03:01 2012 +0000 +++ b/src/os/unix/ngx_atomic.h Mon Aug 06 17:07:28 2012 +0000 @@ -48,7 +48,9 @@ #include <libkern/OSAtomic.h> /* "bool" conflicts with perl's CORE/handy.h */ +#if 0 #undef bool +#endif #define NGX_HAVE_ATOMIC_OPS 1