merge revision(s) 26371,26373,26374,26972:

	* eval.c (thread_timer, rb_thread_stop_timer): check the timing of
	  stopping timer.  patch from KOSAKI Motohiro <kosaki.motohiro _AT_
	  jp.fujitsu.com>
	* eval.c (rb_thread_start_timer): NetBSD5 seems to be hung when calling
	  pthread_create() from pthread_atfork()'s parent handler.
	* io.c (pipe_open): workaround for NetBSD5. stop timer thread before
	  fork(), and start it if needed.
	* process.c (rb_f_fork, rb_f_system): ditto.
	  fixed [ruby-dev:40074]
	  jp.fujitsu.com> via IRC.
	  fork(), and restart it after fork() on parent, and on child if
	  needed.
	  these changes are tested by naruse.  fixed [ruby-dev:40074]
	* io.c, eval.c, process.c: add linux to r26371's condition.
	  patched by Motohiro KOSAKI [ruby-core:28151]


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

1 files changed, 4 insertions, 4 deletions

diff --git a/version.h b/version.h
index 5f8c415b89..cc21317b8b 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-06-07"
+#define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20100607
-#define RUBY_PATCHLEVEL 268
+#define RUBY_RELEASE_CODE 20100608
+#define RUBY_PATCHLEVEL 269
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 8
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];