diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2012-07-24 15:09:54 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2012-07-24 15:09:54 +0000 |
| commit | 1efcca36cc97faa42cfc48128b25c9e1ed748bbd (patch) | |
| tree | aa514d2c62978205f2d4216cd51aab049c11d700 /src/event | |
| parent | 7e72000482b439da9536907a67ccc34cdbb2afef (diff) | |
| download | nginx-1efcca36cc97faa42cfc48128b25c9e1ed748bbd.tar.gz nginx-1efcca36cc97faa42cfc48128b25c9e1ed748bbd.tar.bz2 | |
Fixed compilation with -Wmissing-prototypes.
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 14 | ||||
| -rw-r--r-- | src/event/modules/ngx_eventport_module.c | 31 | ||||
| -rw-r--r-- | src/event/modules/ngx_rtsig_module.c | 12 | ||||
| -rw-r--r-- | src/event/ngx_event.c | 2 |
4 files changed, 53 insertions, 6 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index a73394906..ee77d8e4a 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -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 diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c index bbcd6dd6b..d6dcb0bed 100644 --- a/src/event/modules/ngx_eventport_module.c +++ b/src/event/modules/ngx_eventport_module.c @@ -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; diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c index 2f0f9970f..b36230c76 100644 --- a/src/event/modules/ngx_rtsig_module.c +++ b/src/event/modules/ngx_rtsig_module.c @@ -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; diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index c584dd87d..2120ed7a2 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -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; |
