merge revision(s) 23202,23268,23305:

	* eval.c (safe_mutex_lock): pthread_cleanup_push() must not be
	  inside parens.
	* eval.c (rb_thread_start_timer): guard condition was inverted.
	  [ruby-dev:38319]
	* eval.c (get_ts): use readtime clock.  [ruby-dev:38354]
	* eval.c (rb_thread_stop_timer): clear thread_init while locking.


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

1 files changed, 16 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b67927fe92..ece712f86b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Tue Jul 14 19:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (get_ts): use readtime clock.  [ruby-dev:38354]
+
+	* eval.c (rb_thread_stop_timer): clear thread_init while locking.
+
+Tue Jul 14 19:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_thread_start_timer): guard condition was inverted.
+	  [ruby-dev:38319]
+
+Tue Jul 14 19:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (safe_mutex_lock): pthread_cleanup_push() must not be
+	  inside parens.
+
 Mon Jul 13 01:36:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* time.c (time_timeval): rounds subsecond toward zero.