diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2016-03-21 12:36:36 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2016-03-21 12:36:36 +0300 |
| commit | 1a5922008edad14401584433375a52f6db49c288 (patch) | |
| tree | e9727b4f1a9ac4782da4f0deb6ac4891da587684 /src | |
| parent | 26f669f109c67cba2b1d5a9df439787d79e82135 (diff) | |
| download | nginx-1a5922008edad14401584433375a52f6db49c288.tar.gz nginx-1a5922008edad14401584433375a52f6db49c288.tar.bz2 | |
Events: fixed test building with devpoll and eventport on Linux.
Avoid POLLREMOVE and itimerspec redefinition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/modules/ngx_devpoll_module.c | 2 | ||||
| -rw-r--r-- | src/event/modules/ngx_eventport_module.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c index a932185d7..f985fbdfb 100644 --- a/src/event/modules/ngx_devpoll_module.c +++ b/src/event/modules/ngx_devpoll_module.c @@ -14,7 +14,9 @@ /* Solaris declarations */ +#ifndef POLLREMOVE #define POLLREMOVE 0x0800 +#endif #define DP_POLL 0xD001 #define DP_ISPOLLED 0xD002 diff --git a/src/event/modules/ngx_eventport_module.c b/src/event/modules/ngx_eventport_module.c index bacbb0507..91845479e 100644 --- a/src/event/modules/ngx_eventport_module.c +++ b/src/event/modules/ngx_eventport_module.c @@ -49,7 +49,7 @@ typedef struct port_notify { void *portnfy_user; /* user defined */ } port_notify_t; -#if (__FreeBSD_version < 700005) +#if (__FreeBSD__) && (__FreeBSD_version < 700005) typedef struct itimerspec { /* definition per POSIX.4 */ struct timespec it_interval;/* timer period */ |