Mercurial > hg > nginx

changeset 6447:d17f0584006f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Events: fixed test building with devpoll and eventport on Linux. Avoid POLLREMOVE and itimerspec redefinition.
author Sergey Kandaurov <pluknet@nginx.com>
date Mon, 21 Mar 2016 12:36:36 +0300
parents 0ff7eff48c7e
children 4d1d3c2530e0
files src/event/modules/ngx_devpoll_module.c src/event/modules/ngx_eventport_module.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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 */