diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-02-29 21:03:02 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-02-29 21:03:02 +0000 |
| commit | d94049b6320504f3213adfaad939493676e83a3a (patch) | |
| tree | 7a25b794030cbee22cca6e2bf27aa3569f915d2c /src/event/ngx_event_timer.h | |
| parent | 898446c8bacb5b0e1c223dfec4643ebee8d07f8e (diff) | |
| download | nginx-d94049b6320504f3213adfaad939493676e83a3a.tar.gz nginx-d94049b6320504f3213adfaad939493676e83a3a.tar.bz2 | |
nginx-0.0.2-2004-03-01-00:03:02 import
Diffstat (limited to '')
| -rw-r--r-- | src/event/ngx_event_timer.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/event/ngx_event_timer.h b/src/event/ngx_event_timer.h index 300d79cb7..568a97c0a 100644 --- 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 ngx_rbtree_t *ngx_event_timer_rbtree; -extern ngx_rbtree_t ngx_event_timer_sentinel; +extern 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) @@ -47,7 +47,8 @@ ngx_inline static void ngx_event_del_timer(ngx_event_t *ev) } #endif - ngx_rbtree_delete(&ngx_event_timer_rbtree, &ngx_event_timer_sentinel, + ngx_rbtree_delete((ngx_rbtree_t **) &ngx_event_timer_rbtree, + &ngx_event_timer_sentinel, (ngx_rbtree_t *) &ev->rbtree_key); #if (NGX_THREADS) @@ -87,7 +88,8 @@ ngx_inline static void ngx_event_add_timer(ngx_event_t *ev, ngx_msec_t timer) } #endif - ngx_rbtree_insert(&ngx_event_timer_rbtree, &ngx_event_timer_sentinel, + ngx_rbtree_insert((ngx_rbtree_t **) &ngx_event_timer_rbtree, + &ngx_event_timer_sentinel, (ngx_rbtree_t *) &ev->rbtree_key); #if (NGX_THREADS) |