summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-09 23:57:52 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-09 23:57:52 +0000
commit9eef1971f02f6a0609779b4240f8a885c5a4dd35 (patch)
treef2c751cd97b5f7cc8fb7701a1fadc143b35f654e /thread.c
parentd3776ae249e3e6bd32d6d723eaa47052d5111c1c (diff)
downloadbundler-9eef1971f02f6a0609779b4240f8a885c5a4dd35.tar.gz
* thread.c: Fixed implicit conversion error with Apple clang-800.0.31
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55619 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 a53117ab82..023405bc89 100644
--- a/thread.c
+++ b/thread.c
@@ -1085,7 +1085,7 @@ getclockofday(struct timeval *tp)
if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
tp->tv_sec = ts.tv_sec;
- tp->tv_usec = ts.tv_nsec / 1000;
+ tp->tv_usec = (int)(ts.tv_nsec / 1000);
}
else
#endif