fix building by msvc8 introduced by the previous commit

This commit is contained in:
Igor Sysoev 2010-12-02 14:20:51 +00:00
parent a07d6ec39f
commit 0c39c27412

View File

@ -69,12 +69,10 @@ ngx_event_accept(ngx_event_t *ev)
return; return;
} }
#if (NGX_HAVE_ACCEPT4)
ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ? ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
NGX_LOG_ERR : NGX_LOG_ALERT), NGX_LOG_ERR : NGX_LOG_ALERT),
ev->log, err, ev->log, err,
#if !(NGX_HAVE_ACCEPT4)
"accept() failed");
#else
use_accept4 ? "accept4() failed" : "accept() failed"); use_accept4 ? "accept4() failed" : "accept() failed");
if (use_accept4 && err == NGX_ENOSYS) { if (use_accept4 && err == NGX_ENOSYS) {
@ -82,6 +80,10 @@ ngx_event_accept(ngx_event_t *ev)
ngx_inherited_nonblocking = 0; ngx_inherited_nonblocking = 0;
continue; continue;
} }
#else
ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
NGX_LOG_ERR : NGX_LOG_ALERT),
ev->log, err, "accept() failed");
#endif #endif
if (err == NGX_ECONNABORTED) { if (err == NGX_ECONNABORTED) {