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

3 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 4177633fc1..f72cf3c856 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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):
diff --git a/version.h b/version.h
index 9cbaa2e6dd..4aca9b35f7 100644
--- a/version.h
+++ b/version.h
@@ -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;