diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-08 09:59:58 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-08 09:59:58 +0000 |
commit | e1a304ff665f74036c7a848cb1fd3cf49e3ae3db (patch) | |
tree | f215b2c6751da117242c1026ca81f82db42379c8 | |
parent | c5258c5dca209ba943d34677ecd70cfc4c1348e9 (diff) |
merge revision(s) 19486:
* win32/win32.c (subtruct): check tv_sec.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@23156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | version.h | 8 | ||||
-rw-r--r-- | win32/win32.c | 3 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Wed Apr 8 18:59:52 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (subtruct): check tv_sec. + Thu Apr 2 16:06:17 2009 URABE Shyouhei <shyouhei@ruby-lang.org> * test/rss/test_atom.rb (RSS::TestAtomCore::assert_atom_content_inline_other_base64_to_s): @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-04-02" +#define RUBY_RELEASE_DATE "2009-04-08" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090402 -#define RUBY_PATCHLEVEL 159 +#define RUBY_RELEASE_CODE 20090408 +#define RUBY_PATCHLEVEL 160 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 8 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; diff --git a/win32/win32.c b/win32/win32.c index 96e235af93..1d342316fe 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2196,6 +2196,9 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, static inline int subtract(struct timeval *rest, const struct timeval *wait) { + if (rest->tv_sec < wait->tv_sec) { + return 0; + } while (rest->tv_usec < wait->tv_usec) { if (rest->tv_sec <= wait->tv_sec) { return 0; |