merge revision(s) 24993:24997,25069:25074:

	* win32/win32.c (rb_w32_select): wait specified time on select.
	* win32/win32.c (rb_w32_select): on 1.8, we don't need to poll sockets,
	  because our select is never called from multiple threads.
	* instruby.rb: win32/win32.h exists in srcdir.
	  reported by arton ( http://www.artonx.org/diary/20090919.html#p01 )
	* win32/win32.c (subtract): if the parameters are same value, should
	  return zero.
	* win32/win32.c (rb_w32_select): of course, need to initialize rest.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@25838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/version.h b/version.h
index cf30b9b39a..58bb8a229d 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-11-17"
+#define RUBY_RELEASE_DATE "2009-11-18"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20091117
-#define RUBY_PATCHLEVEL 210
+#define RUBY_RELEASE_CODE 20091118
+#define RUBY_PATCHLEVEL 211
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];