shyouhei	2009-04-08 18:59:58 +0900 (Wed, 08 Apr 2009)

  New Revision: 23156

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23156

  Log:
    merge revision(s) 19486:
    * win32/win32.c (subtruct): check tv_sec.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/version.h
    branches/ruby_1_8_7/win32/win32.c

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 23155)
+++ ruby_1_8_7/ChangeLog	(revision 23156)
@@ -1,3 +1,7 @@
+Wed Apr  8 18:59:52 2009  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (subtruct): check tv_sec.
+
 Thu Apr  2 16:06:17 2009  URABE Shyouhei  <shyouhei@r...>
 
 	* test/rss/test_atom.rb (RSS::TestAtomCore::assert_atom_content_inline_other_base64_to_s):
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 23155)
+++ ruby_1_8_7/version.h	(revision 23156)
@@ -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[];
Index: ruby_1_8_7/win32/win32.c
===================================================================
--- ruby_1_8_7/win32/win32.c	(revision 23155)
+++ ruby_1_8_7/win32/win32.c	(revision 23156)
@@ -2196,6 +2196,9 @@
 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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/