[nginx] Replaced the remaining NGX_OLD_THREADS check with NGX_WI...

Ruslan Ermilov ru at nginx.com
Thu Apr 16 20:02:19 UTC 2015


details:   http://hg.nginx.org/nginx/rev/36d99c042652
branches:  
changeset: 6113:36d99c042652
user:      Ruslan Ermilov <ru at nginx.com>
date:      Thu Mar 26 14:20:51 2015 +0300
description:
Replaced the remaining NGX_OLD_THREADS check with NGX_WIN32.

diffstat:

 src/event/ngx_event.c           |  4 +++-
 src/os/win32/ngx_win32_config.h |  2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 8c79c506ea20 -r 36d99c042652 src/event/ngx_event.c
--- a/src/event/ngx_event.c	Thu Mar 26 14:20:07 2015 +0300
+++ b/src/event/ngx_event.c	Thu Mar 26 14:20:51 2015 +0300
@@ -212,7 +212,9 @@ ngx_process_events_and_timers(ngx_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 -r 8c79c506ea20 -r 36d99c042652 src/os/win32/ngx_win32_config.h
--- a/src/os/win32/ngx_win32_config.h	Thu Mar 26 14:20:07 2015 +0300
+++ b/src/os/win32/ngx_win32_config.h	Thu Mar 26 14:20:51 2015 +0300
@@ -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
 



More information about the nginx-devel mailing list