summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-20 16:13:35 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-20 16:13:35 +0000
commitf82a6840a80e42e823a455ef3eb726a6b67e5485 (patch)
tree3c46c003c07ae8e08f42b2b1692baa3bb56570b0 /win32
parent268f95bdc653552a16ee4611a4d6dd84fcfb817f (diff)
* 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/trunk@27930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 62498cb47c..506a960d36 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2471,7 +2471,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