summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-26 23:48:31 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-26 23:48:31 +0000
commite65e24bd2747203862e6773d7c74996d58e92f4e (patch)
tree86ca49e1e142c42ca9dd69f04f11bcc44adcf787
parent542190ce584fe2f0923227e591bfe2b8880dad42 (diff)
* thread.c (ppoll): typo bug fix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--thread.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a25eab..e3ad832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 27 08:47:26 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+ * thread.c (ppoll): typo bug fix.
+
Fri May 27 08:35:04 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop.
diff --git a/thread.c b/thread.c
index cf7affa..1614bfe 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);
}