From e65e24bd2747203862e6773d7c74996d58e92f4e Mon Sep 17 00:00:00 2001 From: nagai Date: Thu, 26 May 2011 23:48:31 +0000 Subject: [PATCH] * thread.c (ppoll): typo bug fix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ thread.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a25eab1ca..e3ad8329d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri May 27 08:47:26 2011 Hidetoshi NAGAI + + * thread.c (ppoll): typo bug fix. + Fri May 27 08:35:04 2011 Hidetoshi NAGAI * ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop. diff --git a/thread.c b/thread.c index cf7affa424..1614bfe925 100644 --- a/thread.c +++ b/thread.c @@ -2759,14 +2759,14 @@ int ppoll(struct pollfd *fds, nfds_t nfds, timeout_ms = -1; else { tmp = ts->tv_sec * 1000; - tmp2 = tv->tv_nsec / (1000 * 1000); + tmp2 = ts->tv_nsec / (1000 * 1000); if (TIMET_MAX - tmp < tmp2) timeout_ms = -1; else timeout_ms = tmp + tmp2; } } else - timeout = -1; + timeout_ms = -1; return poll(fds, nfds, timeout_ms); }