Mercurial > hg > nginx

changeset 2723:53be1d485af9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add variadic macros support for msvc8
author Igor Sysoev <igor@sysoev.ru>
date Sun, 19 Apr 2009 16:25:02 +0000
parents ffa8e2451457
children 9fd2f12fee0a
files auto/cc/msvc src/event/ngx_event_accept.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@@ -97,6 +97,12 @@ if [ $NGX_CC_NAME != msvc8 ]; then
 fi
 
 
+# MSVC 2005 supports C99 variadic macros
+if [ $NGX_CC_NAME = msvc8 ]; then
+   have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have
+fi
+
+
 # precompiled headers
 CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch"
 NGX_PCH="$NGX_OBJS/ngx_config.pch"
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -57,8 +57,8 @@ ngx_event_accept(ngx_event_t *ev)
                 return;
             }
 
-            ngx_log_error((err == NGX_ECONNABORTED) ? NGX_LOG_ERR:
-                                                      NGX_LOG_ALERT,
+            ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
+                                             NGX_LOG_ERR : NGX_LOG_ALERT),
                           ev->log, err, "accept() failed");
 
             if (err == NGX_ECONNABORTED) {