Merge pull request #61 from ppliu1979/master

fix a compile error in ngx_ff_channel.c
This commit is contained in:
logwang 2017-08-25 19:07:25 +08:00 committed by GitHub
commit e23c20de1e
1 changed files with 2 additions and 2 deletions

View File

@ -368,7 +368,7 @@ ngx_ff_epoll_process_events(ngx_cycle_t *cycle,
/* NGX_TIMER_INFINITE == INFTIM */ /* NGX_TIMER_INFINITE == INFTIM */
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"epoll timer: %M", timer); "epoll timer: %M", timer);
events = epoll_wait(ep, event_list, (int) nevents, timer); events = epoll_wait(ep, event_list, (int) nevents, timer);
@ -455,7 +455,7 @@ ngx_ff_epoll_process_events(ngx_cycle_t *cycle,
* that was just closed in this iteration * that was just closed in this iteration
*/ */
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"epoll: stale event %p", c); "epoll: stale event %p", c);
continue; continue;
} }