Mercurial > hg > nginx

changeset 3813:c870fb78550c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix building by msvc8 introduced by the previous commit
author Igor Sysoev <igor@sysoev.ru>
date Thu, 02 Dec 2010 14:20:51 +0000
parents ef27dc1a7832
children e6e453203bae
files src/event/ngx_event_accept.c
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -69,12 +69,10 @@ ngx_event_accept(ngx_event_t *ev)
                 return;
             }
 
+#if (NGX_HAVE_ACCEPT4)
             ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
                                              NGX_LOG_ERR : NGX_LOG_ALERT),
                           ev->log, err,
-#if !(NGX_HAVE_ACCEPT4)
-                          "accept() failed");
-#else
                           use_accept4 ? "accept4() failed" : "accept() failed");
 
             if (use_accept4 && err == NGX_ENOSYS) {
@@ -82,6 +80,10 @@ ngx_event_accept(ngx_event_t *ev)
                 ngx_inherited_nonblocking = 0;
                 continue;
             }
+#else
+            ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
+                                             NGX_LOG_ERR : NGX_LOG_ALERT),
+                          ev->log, err, "accept() failed");
 #endif
 
             if (err == NGX_ECONNABORTED) {