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, 4 insertions, 4 deletions

diff --git a/version.h b/version.h
index 5bba3f1321..9e3d37f1f9 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-07-13"
+#define RUBY_RELEASE_DATE "2009-07-14"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090713
-#define RUBY_PATCHLEVEL 182
+#define RUBY_RELEASE_CODE 20090714
+#define RUBY_PATCHLEVEL 183
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];