diff options
author | Ruslan Ermilov <ru@nginx.com> | 2015-03-26 14:20:51 +0300 |
---|---|---|
committer | Ruslan Ermilov <ru@nginx.com> | 2015-03-26 14:20:51 +0300 |
commit | 9b411460f967aa018e31dd3cd6f1e66ff3bfba5c (patch) | |
tree | eccfbc2dabffb2b9ab489fff59610a574cc11d0d | |
parent | bfd2db83a7ca68b3caed6cc2253a2aeb6d2f9b92 (diff) | |
download | nginx-9b411460f967aa018e31dd3cd6f1e66ff3bfba5c.tar.gz nginx-9b411460f967aa018e31dd3cd6f1e66ff3bfba5c.zip |
Replaced the remaining NGX_OLD_THREADS check with NGX_WIN32.
-rw-r--r-- | src/event/ngx_event.c | 4 | ||||
-rw-r--r-- | src/os/win32/ngx_win32_config.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 31514c44b..69b69ffbe 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -212,7 +212,9 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle) timer = ngx_event_find_timer(); flags = NGX_UPDATE_TIME; -#if (NGX_OLD_THREADS) +#if (NGX_WIN32) + + /* handle signals from master in case of network inactivity */ if (timer == NGX_TIMER_INFINITE || timer > 500) { timer = 500; diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index f4b2eea31..36a486fa8 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -218,8 +218,6 @@ typedef int sig_atomic_t; #define NGX_HAVE_LITTLE_ENDIAN 1 #define NGX_HAVE_NONALIGNED 1 -#define NGX_OLD_THREADS 1 - #define NGX_WIN_NT 200000 |