mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
d3776ae249
commit
9eef1971f0
2 changed files with 5 additions and 1 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Sun Jul 10 08:57:20 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||||
|
|
||||||
|
* thread.c: Fixed implicit conversion error with Apple clang-800.0.31
|
||||||
|
|
||||||
Sat Jul 9 12:43:09 2016 Shugo Maeda <shugo@ruby-lang.org>
|
Sat Jul 9 12:43:09 2016 Shugo Maeda <shugo@ruby-lang.org>
|
||||||
|
|
||||||
* lib/getoptlong.rb: use false instead of FALSE.
|
* lib/getoptlong.rb: use false instead of FALSE.
|
||||||
|
|
2
thread.c
2
thread.c
|
@ -1085,7 +1085,7 @@ getclockofday(struct timeval *tp)
|
||||||
|
|
||||||
if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
|
if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
|
||||||
tp->tv_sec = ts.tv_sec;
|
tp->tv_sec = ts.tv_sec;
|
||||||
tp->tv_usec = ts.tv_nsec / 1000;
|
tp->tv_usec = (int)(ts.tv_nsec / 1000);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue