From 1a5922008edad14401584433375a52f6db49c288 Mon Sep 17 00:00:00 2001 From: Sergey Kandaurov Date: Mon, 21 Mar 2016 12:36:36 +0300 Subject: [PATCH] Events: fixed test building with devpoll and eventport on Linux. Avoid POLLREMOVE and itimerspec redefinition. --- src/event/modules/ngx_devpoll_module.c | 2 ++ src/event/modules/ngx_eventport_module.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 */