summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-16 07:37:24 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-16 07:37:24 +0000
commitf86cd0d4c20b3422c7715f7d79dbb47df2eb8e52 (patch)
treed3194bf4e401a26016bcb77ec79a76d6f69ef7c9
parentc569163e9e20bbba9dc49aa59d32ce08445df509 (diff)
* ext/tk/tcltklib.c (eventloop_sleep, lib_eventloop_core),
(lib_watchdog_core): tv_usec is not time_t. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/tcltklib.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cc0a52c4486..f5e08e3cf99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 16 16:37:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/tk/tcltklib.c (eventloop_sleep, lib_eventloop_core),
+ (lib_watchdog_core): tv_usec is not time_t.
+
Mon Mar 16 12:30:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (REVISION_H): keeps timestamp of revision.h.
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index a187dceed57..fe199ef483c 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -1558,7 +1558,7 @@ eventloop_sleep(dummy)
}
t.tv_sec = (time_t)0;
- t.tv_usec = (time_t)(no_event_wait*1000.0);
+ t.tv_usec = (long)(no_event_wait*1000.0);
#ifdef HAVE_NATIVETHREAD
#ifndef RUBY_USE_NATIVE_THREAD
@@ -1664,7 +1664,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
if (update_flag) DUMP1("update loop start!!");
t.tv_sec = (time_t)0;
- t.tv_usec = (time_t)(no_event_wait*1000.0);
+ t.tv_usec = (long)(no_event_wait*1000.0);
Tcl_DeleteTimerHandler(timer_token);
run_timer_flag = 0;
@@ -2241,9 +2241,9 @@ lib_watchdog_core(check_rootwidget)
struct timeval t0, t1;
t0.tv_sec = (time_t)0;
- t0.tv_usec = (time_t)((NO_THREAD_INTERRUPT_TIME)*1000.0);
+ t0.tv_usec = (long)((NO_THREAD_INTERRUPT_TIME)*1000.0);
t1.tv_sec = (time_t)0;
- t1.tv_usec = (time_t)((WATCHDOG_INTERVAL)*1000.0);
+ t1.tv_usec = (long)((WATCHDOG_INTERVAL)*1000.0);
/* check other watchdog thread */
if (!NIL_P(watchdog_thread)) {