]> git.kaiwu.me - nginx.git/commitdiff
fix building by msvc8 introduced by the previous commit
authorIgor Sysoev <igor@sysoev.ru>
Thu, 2 Dec 2010 14:20:51 +0000 (14:20 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Thu, 2 Dec 2010 14:20:51 +0000 (14:20 +0000)
src/event/ngx_event_accept.c

index 0feba857d1e8373fc20d3e6477712261999eace2..2355d1bdaddcb084a0d701fd5e354fa696a0a0f1 100644 (file)
@@ -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) {