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.
This commit is contained in:
Maxim Dounin 2012-08-06 17:07:28 +00:00
parent 09e0f2a76e
commit d833679582
15 changed files with 76 additions and 8 deletions

View File

@ -149,6 +149,7 @@ CFLAGS="$CFLAGS ${NGX_GCC_OPT:--O} -W"
CFLAGS="$CFLAGS -Wall -Wpointer-arith"
#CFLAGS="$CFLAGS -Wconversion"
#CFLAGS="$CFLAGS -Winline"
#CFLAGS="$CFLAGS -Wmissing-prototypes"
case "$NGX_GCC_VER" in

View File

@ -1448,12 +1448,16 @@ ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
#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)

View File

@ -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>

View File

@ -44,16 +44,25 @@ struct epoll_event {
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 @@ struct io_event {
};
int eventfd(u_int initval)
{
return -1;
}
#endif
#endif

View File

@ -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 @@ typedef struct itimerspec { /* definition per POSIX.4 */
#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;

View File

@ -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,10 +26,15 @@
#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)
{

View File

@ -567,7 +567,7 @@ ngx_event_module_init(ngx_cycle_t *cycle)
#if !(NGX_WIN32)
void
static void
ngx_timer_signal_handler(int signo)
{
ngx_event_timer_alarm = 1;

View File

@ -218,7 +218,7 @@ static ngx_http_log_var_t ngx_http_log_vars[] = {
};
ngx_int_t
static ngx_int_t
ngx_http_log_handler(ngx_http_request_t *r)
{
u_char *line, *p;

View File

@ -81,7 +81,7 @@ ngx_module_t ngx_http_upstream_least_conn_module = {
};
ngx_int_t
static ngx_int_t
ngx_http_upstream_init_least_conn(ngx_conf_t *cf,
ngx_http_upstream_srv_conf_t *us)
{

View File

@ -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 };

View File

@ -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

View File

@ -20,6 +20,8 @@ extern "C" {
// #include <string>
void ngx_cpp_test_handler(void *data);
void
ngx_cpp_test_handler(void *data)
{

View File

@ -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

View File

@ -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

View File

@ -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