nginx-0.0.3-2004-04-16-09:14:16 import

6 files changed, 12 insertions, 6 deletions

diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index 204bcae21..485476278 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -333,7 +333,8 @@ int ngx_devpoll_process_events(ngx_cycle_t *cycle)
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                        "devpoll expired timer");
 
-        ngx_event_expire_timers(ngx_elapsed_msec - ngx_old_elapsed_msec);
+        ngx_event_expire_timers((ngx_msec_t)
+                                    (ngx_elapsed_msec - ngx_old_elapsed_msec));
     }
 
     /* NGX_TIMER_INFINITE == INFTIM */
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index bc4f7c3b8..5097f6c70 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -363,7 +363,8 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle)
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                        "epoll expired timer");
 
-        ngx_event_expire_timers(ngx_elapsed_msec - ngx_old_elapsed_msec);
+        ngx_event_expire_timers((ngx_msec_t)
+                                    (ngx_elapsed_msec - ngx_old_elapsed_msec));
     }
 
     /* NGX_TIMER_INFINITE == INFTIM */
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index acd92f29a..70944ea26 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -376,7 +376,8 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                        "kevent expired timer");
 
-        ngx_event_expire_timers(ngx_elapsed_msec - ngx_old_elapsed_msec);
+        ngx_event_expire_timers((ngx_msec_t)
+                                    (ngx_elapsed_msec - ngx_old_elapsed_msec));
 
         /* TODO: if ngx_threaded then wake up the worker thread */
     }
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 5d4d91f11..e1ef12320 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -287,7 +287,8 @@ int ngx_poll_process_events(ngx_cycle_t *cycle)
             ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                            "poll expired timer");
 
-            ngx_event_expire_timers(ngx_elapsed_msec - ngx_old_elapsed_msec);
+            ngx_event_expire_timers((ngx_msec_t)
+                                    (ngx_elapsed_msec - ngx_old_elapsed_msec));
         }
 
         /* NGX_TIMER_INFINITE == INFTIM */
diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index 172608878..22243f52c 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -214,7 +214,8 @@ int ngx_rtsig_process_events(ngx_cycle_t *cycle)
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                        "rtsig expired timer");
 
-        ngx_event_expire_timers(ngx_elapsed_msec - ngx_old_elapsed_msec);
+        ngx_event_expire_timers((ngx_msec_t)
+                                    (ngx_elapsed_msec - ngx_old_elapsed_msec));
     }
 
     expire = 1;
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 85f3fcee5..b995b7b69 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -273,7 +273,8 @@ static int ngx_select_process_events(ngx_cycle_t *cycle)
         ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
                        "select expired timer");
 
-        ngx_event_expire_timers(ngx_elapsed_msec - ngx_old_elapsed_msec);
+        ngx_event_expire_timers((ngx_msec_t)
+                                    (ngx_elapsed_msec - ngx_old_elapsed_msec));
     }
 
     ngx_old_elapsed_msec = ngx_elapsed_msec;