aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-09 02:06:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-11-09 02:06:49 +0000
commitb10c3136b0163536a679b10fecbc2992f3b5fa64 (patch)
treee4dd5a35acb5667f8d6abe81b273070e08e32611
parente120e375774f9cb3f45e3275f03bfdf06c6b2a6e (diff)
downloadruby-b10c3136b0163536a679b10fecbc2992f3b5fa64.tar.gz
* thread.c (do_select): fix cast, tv_sec is time_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--thread.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b9503bcb3d..8b9178da66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 9 11:02:54 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * thread.c (do_select): fix cast, tv_sec is time_t.
+
Wed Nov 9 10:32:20 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: should not use test -e for portability.
diff --git a/thread.c b/thread.c
index 80550eeaaa..38b524e1bc 100644
--- a/thread.c
+++ b/thread.c
@@ -2570,7 +2570,7 @@ do_select(int n, rb_fdset_t *read, rb_fdset_t *write, rb_fdset_t *except,
if (timeout) {
double d = limit - timeofday();
- wait_rest.tv_sec = (unsigned int)d;
+ wait_rest.tv_sec = (time_t)d;
wait_rest.tv_usec = (int)((d-(double)wait_rest.tv_sec)*1e6);
if (wait_rest.tv_sec < 0) wait_rest.tv_sec = 0;
if (wait_rest.tv_usec < 0) wait_rest.tv_usec = 0;