archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r27930 from trunk into ruby_1_9_2.

Browse source 
--
* thread.c (subtract_tv): if the rest is zero, should finish waiting
  immediately.

* win32/win32.c (subtract): ditto.
  based on a patch from Roger Pack in [ruby-core:27957].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-05-23 12:18:44 +00:00
parent e7ec68a456
commit ef8f24d06e
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
win32/win32.c
View file

@ -2467,7 +2467,7 @@ subtract(struct timeval *rest, const struct timeval *wait)
}
rest->tv_sec -= wait->tv_sec;
rest->tv_usec -= wait->tv_usec;
return 1;
return rest->tv_sec != 0 || rest->tv_usec != 0;
}
static inline int