diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-19 16:25:02 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-19 16:25:02 +0000 |
| commit | 694bdea2a978f810de3dfb3d7a6e110b3aeeaddf (patch) | |
| tree | 9a8cbcc841f8c61720585079b645d0951873dd1d | |
| parent | 1153aa646573103baa9868f668eb8a562ec8cf63 (diff) | |
| download | nginx-694bdea2a978f810de3dfb3d7a6e110b3aeeaddf.tar.gz nginx-694bdea2a978f810de3dfb3d7a6e110b3aeeaddf.zip | |
add variadic macros support for msvc8
| -rw-r--r-- | auto/cc/msvc | 6 | ||||
| -rw-r--r-- | src/event/ngx_event_accept.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/auto/cc/msvc b/auto/cc/msvc index 9db367a28..4a053283f 100644 --- 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" diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c index d39a497d8..a17d63038 100644 --- 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) { |