nginx-0.0.2-2004-03-02-18:40:59 import

diff --git a/auto/configure b/auto/configure
index a944573a5e73d815827ee8af8ca114f28f0d9337..e89785fde2d6ee19d93acae83ea11ec3bdba4f02 100755 (executable)
--- a/auto/configure
+++ b/auto/configure
@@ -1,3 +1,4 @@
+#!/bin/sh
 
 . auto/options
 . auto/init

diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c
index 8983d997b69496bf0c224605be77a8f304b60bb2..79a2e195d3077a37c07d66a14ad6d38ba07ed93c 100644 (file)
--- a/src/event/ngx_event_timer.c
+++ b/src/event/ngx_event_timer.c
@@ -9,8 +9,8 @@ ngx_mutex_t  *ngx_event_timer_mutex;
 #endif
 
 
-volatile ngx_rbtree_t  *ngx_event_timer_rbtree;
-ngx_rbtree_t            ngx_event_timer_sentinel;
+ngx_thread_volatile ngx_rbtree_t  *ngx_event_timer_rbtree;
+ngx_rbtree_t                       ngx_event_timer_sentinel;
 
 
 ngx_int_t ngx_event_timer_init(ngx_log_t *log)

diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h
index 568a97c0aa78deefad6efd05fec2f8391a289d74..21f261f88330d5dfdf1957c334024a94d71b3902 100644 (file)
--- a/src/event/ngx_event_timer.h
+++ b/src/event/ngx_event_timer.h
@@ -31,8 +31,8 @@ extern ngx_mutex_t  *ngx_event_timer_mutex;
 #endif
 
 
-extern volatile ngx_rbtree_t  *ngx_event_timer_rbtree;
-extern ngx_rbtree_t            ngx_event_timer_sentinel;
+extern ngx_thread_volatile ngx_rbtree_t  *ngx_event_timer_rbtree;
+extern ngx_rbtree_t                       ngx_event_timer_sentinel;
 
 
 ngx_inline static void ngx_event_del_timer(ngx_event_t *ev)

diff --git a/src/os/unix/ngx_thread.h b/src/os/unix/ngx_thread.h
index 8a02880bb4229f900e4f015176714c2133dac09f..0b065d8ec9e1ee7599a878a98c104814776ee260 100644 (file)
--- a/src/os/unix/ngx_thread.h
+++ b/src/os/unix/ngx_thread.h
@@ -7,6 +7,8 @@
 
 #if (NGX_THREADS)
 
+#define ngx_thread_volatile  volatile
+
 #if (NGX_USE_RFORK)
 
 #include <sys/ipc.h>
@@ -96,6 +98,8 @@ extern ngx_int_t ngx_threaded;
 
 #else /* !NGX_THREADS */
 
+#define ngx_thread_volatile
+
 #define ngx_log_tid  0
 #define TID_T_FMT    "%d"