[nginx] svn commit: r4799 - in branches/stable-1.2: . auto/cc src/core src/event src/event/modules src/http src/http/modules src/mail src/misc src/os/unix
mdounin at mdounin.ru
mdounin at mdounin.ru
Mon Aug 6 17:07:28 UTC 2012
Author: mdounin
Date: 2012-08-06 17:07:28 +0000 (Mon, 06 Aug 2012)
New Revision: 4799
URL: http://trac.nginx.org/nginx/changeset/4799/nginx
Log:
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.
Modified:
branches/stable-1.2/
branches/stable-1.2/auto/cc/gcc
branches/stable-1.2/src/core/ngx_conf_file.c
branches/stable-1.2/src/core/ngx_crypt.c
branches/stable-1.2/src/event/modules/ngx_epoll_module.c
branches/stable-1.2/src/event/modules/ngx_eventport_module.c
branches/stable-1.2/src/event/modules/ngx_rtsig_module.c
branches/stable-1.2/src/event/ngx_event.c
branches/stable-1.2/src/http/modules/ngx_http_log_module.c
branches/stable-1.2/src/http/modules/ngx_http_upstream_least_conn_module.c
branches/stable-1.2/src/http/ngx_http_parse_time.c
branches/stable-1.2/src/mail/ngx_mail_parse.c
branches/stable-1.2/src/misc/ngx_cpp_test_module.cpp
branches/stable-1.2/src/os/unix/ngx_atomic.h
branches/stable-1.2/src/os/unix/ngx_posix_init.c
branches/stable-1.2/src/os/unix/ngx_solaris_sendfilev_chain.c
Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2 2012-08-06 17:07:28 UTC (rev 4799)
Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4759,4762,4768
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4762,4768
\ No newline at end of property
Modified: branches/stable-1.2/auto/cc/gcc
===================================================================
--- branches/stable-1.2/auto/cc/gcc 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/auto/cc/gcc 2012-08-06 17:07:28 UTC (rev 4799)
@@ -149,6 +149,7 @@
CFLAGS="$CFLAGS -Wall -Wpointer-arith"
#CFLAGS="$CFLAGS -Wconversion"
#CFLAGS="$CFLAGS -Winline"
+#CFLAGS="$CFLAGS -Wmissing-prototypes"
case "$NGX_GCC_VER" in
Modified: branches/stable-1.2/src/core/ngx_conf_file.c
===================================================================
--- branches/stable-1.2/src/core/ngx_conf_file.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/core/ngx_conf_file.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -1448,13 +1448,17 @@
}
+#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)
{
Modified: branches/stable-1.2/src/core/ngx_crypt.c
===================================================================
--- branches/stable-1.2/src/core/ngx_crypt.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/core/ngx_crypt.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -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>
Modified: branches/stable-1.2/src/event/modules/ngx_epoll_module.c
===================================================================
--- branches/stable-1.2/src/event/modules/ngx_epoll_module.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/event/modules/ngx_epoll_module.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -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
Modified: branches/stable-1.2/src/event/modules/ngx_eventport_module.c
===================================================================
--- branches/stable-1.2/src/event/modules/ngx_eventport_module.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/event/modules/ngx_eventport_module.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -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;
Modified: branches/stable-1.2/src/event/modules/ngx_rtsig_module.c
===================================================================
--- branches/stable-1.2/src/event/modules/ngx_rtsig_module.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/event/modules/ngx_rtsig_module.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -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;
Modified: branches/stable-1.2/src/event/ngx_event.c
===================================================================
--- branches/stable-1.2/src/event/ngx_event.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/event/ngx_event.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -567,7 +567,7 @@
#if !(NGX_WIN32)
-void
+static void
ngx_timer_signal_handler(int signo)
{
ngx_event_timer_alarm = 1;
Modified: branches/stable-1.2/src/http/modules/ngx_http_log_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_log_module.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/http/modules/ngx_http_log_module.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -218,7 +218,7 @@
};
-ngx_int_t
+static ngx_int_t
ngx_http_log_handler(ngx_http_request_t *r)
{
u_char *line, *p;
Modified: branches/stable-1.2/src/http/modules/ngx_http_upstream_least_conn_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_upstream_least_conn_module.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/http/modules/ngx_http_upstream_least_conn_module.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -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)
{
Modified: branches/stable-1.2/src/http/ngx_http_parse_time.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_parse_time.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/http/ngx_http_parse_time.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -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 };
Modified: branches/stable-1.2/src/mail/ngx_mail_parse.c
===================================================================
--- branches/stable-1.2/src/mail/ngx_mail_parse.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/mail/ngx_mail_parse.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -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
Modified: branches/stable-1.2/src/misc/ngx_cpp_test_module.cpp
===================================================================
--- branches/stable-1.2/src/misc/ngx_cpp_test_module.cpp 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/misc/ngx_cpp_test_module.cpp 2012-08-06 17:07:28 UTC (rev 4799)
@@ -20,6 +20,8 @@
// #include <string>
+void ngx_cpp_test_handler(void *data);
+
void
ngx_cpp_test_handler(void *data)
{
Modified: branches/stable-1.2/src/os/unix/ngx_atomic.h
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_atomic.h 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/os/unix/ngx_atomic.h 2012-08-06 17:07:28 UTC (rev 4799)
@@ -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
Modified: branches/stable-1.2/src/os/unix/ngx_posix_init.c
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_posix_init.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/os/unix/ngx_posix_init.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -98,6 +98,8 @@
}
+#if 0
+
ngx_int_t
ngx_posix_post_conf_init(ngx_log_t *log)
{
@@ -122,3 +124,5 @@
return NGX_OK;
}
+
+#endif
Modified: branches/stable-1.2/src/os/unix/ngx_solaris_sendfilev_chain.c
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_solaris_sendfilev_chain.c 2012-08-06 17:03:01 UTC (rev 4798)
+++ branches/stable-1.2/src/os/unix/ngx_solaris_sendfilev_chain.c 2012-08-06 17:07:28 UTC (rev 4799)
@@ -29,6 +29,9 @@
return -1;
}
+ngx_chain_t *ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in,
+ off_t limit);
+
#endif
More information about the nginx-devel
mailing list