Klaus Demo nginx / f5fff1e
Fixed --test-build-*. Fixes various aspects of --test-build-devpoll, --test-build-eventport, and --test-build-epoll. In particular, if --test-build-devpoll was used on Linux, then "devpoll" event method would be preferred over "epoll". Also, wrong definitions of event macros were chosen. Ruslan Ermilov 3 years ago
3 changed file(s) with 5 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
12071207
12081208 #endif
12091209
1210 #if (NGX_HAVE_DEVPOLL)
1210 #if (NGX_HAVE_DEVPOLL) && !(NGX_TEST_BUILD_DEVPOLL)
12111211
12121212 module = &ngx_devpoll_module;
12131213
342342 #define NGX_DISABLE_EVENT EV_DISABLE
343343
344344
345 #elif (NGX_HAVE_DEVPOLL || NGX_HAVE_EVENTPORT)
345 #elif (NGX_HAVE_DEVPOLL && !(NGX_TEST_BUILD_DEVPOLL)) \
346 || (NGX_HAVE_EVENTPORT && !(NGX_TEST_BUILD_EVENTPORT))
346347
347348 #define NGX_READ_EVENT POLLIN
348349 #define NGX_WRITE_EVENT POLLOUT
351352 #define NGX_ONESHOT_EVENT 1
352353
353354
354 #elif (NGX_HAVE_EPOLL)
355 #elif (NGX_HAVE_EPOLL) && !(NGX_TEST_BUILD_EPOLL)
355356
356357 #define NGX_READ_EVENT (EPOLLIN|EPOLLRDHUP)
357358 #define NGX_WRITE_EVENT EPOLLOUT
127127 #endif
128128
129129
130 #if (NGX_HAVE_DEVPOLL)
130 #if (NGX_HAVE_DEVPOLL) && !(NGX_TEST_BUILD_DEVPOLL)
131131 #include <sys/ioctl.h>
132132 #include <sys/devpoll.h>
133133 #endif