diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-04-01 06:21:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-01 06:21:13 +0000 |
| commit | 205dc145c5d22613826927d6ae8ccd3a69d0e907 (patch) | |
| tree | 140fa2cbc7c93beca47af90db0e35d9563ae6146 /src/os/win32 | |
| parent | 709405b7559d3abcb90b61368c7072fb774f661b (diff) | |
| download | nginx-205dc145c5d22613826927d6ae8ccd3a69d0e907.tar.gz nginx-205dc145c5d22613826927d6ae8ccd3a69d0e907.tar.bz2 | |
nginx-0.0.3-2004-04-01-10:21:13 import
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index 929171055..1b8f18629 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -48,6 +48,6 @@ void ngx_master_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) for ( ;; ) { ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle"); - ngx_process_events(cycle->log); + ngx_process_events(cycle); } } diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index cab3321e5..cc3a06842 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -31,6 +31,7 @@ /* disable some "-W4" level warnings */ #pragma warning(disable:4054) +#pragma warning(disable:4054) #pragma warning(disable:4055) /* unreferenced formal parameter */ #pragma warning(disable:4100) @@ -43,6 +44,8 @@ #ifdef __WATCOMC__ +/* unreachable code */ +#pragma disable_message(201) /* disable "Symbol 'ngx_rbtree_min' has been defined, but not referenced" */ #pragma disable_message(202) #endif @@ -86,6 +89,7 @@ typedef long time_t; typedef __int64 off_t; typedef uint32_t in_addr_t; typedef int sig_atomic_t; +typedef uint32_t ngx_atomic_t; #define OFF_T_FMT "%I64d" |