]> git.kaiwu.me - nginx.git/commitdiff
Replaced the remaining NGX_OLD_THREADS check with NGX_WIN32.
authorRuslan Ermilov <ru@nginx.com>
Thu, 26 Mar 2015 11:20:51 +0000 (14:20 +0300)
committerRuslan Ermilov <ru@nginx.com>
Thu, 26 Mar 2015 11:20:51 +0000 (14:20 +0300)
src/event/ngx_event.c
src/os/win32/ngx_win32_config.h

index 31514c44bd4e70bd2379834449390a42bd08b77a..69b69ffbe96a5a416bb31adaff04adc877649af3 100644 (file)
@@ -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;
index f4b2eea31026a5620fa00e8d7a04542aa6d6a296..36a486fa85da564bc9280eb89bb56381eb16db7d 100644 (file)
@@ -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