summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-07 06:14:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-07 06:14:56 +0000
commitb0cf1c234c142b73d556fe5c66b76a3db8997899 (patch)
treeb3076cc39d99ae5d74162cc18886026721ae4f52 /thread.c
parent714836c152cf52da40e505157a73ac00f8c3c4f1 (diff)
fix up r62272
* thread.c (timeval_for): tv_usec is suseconds_t which may be smaller than long. * thread_pthread.c (native_cond_timeout): ret is now used in CLOCK_MONOTONIC case only. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/thread.c b/thread.c
index a7f29666a3..375a8a51f5 100644
--- a/thread.c
+++ b/thread.c
@@ -225,7 +225,7 @@ timeval_for(struct timeval *tv, const struct timespec *ts)
{
if (tv && ts) {
tv->tv_sec = ts->tv_sec;
- tv->tv_usec = ts->tv_nsec / 1000;
+ tv->tv_usec = (suseconds_t)(ts->tv_nsec / 1000);
return tv;
}
return 0;