From ef8f24d06ebb9a4c4964d265d9be459249efc9ac Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 23 May 2010 12:18:44 +0000 Subject: merges r27930 from trunk into ruby_1_9_2. -- * 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 --- win32/win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'win32') diff --git a/win32/win32.c b/win32/win32.c index b60ea8cadd..bd4aa3ce30 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -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 -- cgit v1.2.3