Syntax change and dead code cleanup to help resolve some build issues on certain platforms.

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

4 files changed, 12 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 479530ccb0..9deab108e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 5  07:19:00 2010 Kirk Haines <khaines@ruby-lang.org>
+
+	* eval.c: Small syntax change and dead code removal to fix build problems on some platforms.
+
+	* process.c: Dead code removal.
+
 Wed Feb 4  01:06:00 2010 Kirk Haines <khaines@ruby-lang.org>
 
 	* eval.c: Backport #1743 [ruby-core:24203]; stops timer thread unless other threads exist.
diff --git a/eval.c b/eval.c
index af63617347..7aa45867f9 100644
--- a/eval.c
+++ b/eval.c
@@ -11990,8 +11990,8 @@ static struct timer_thread {
 } time_thread = {PTHREAD_COND_INITIALIZER, PTHREAD_MUTEX_INITIALIZER};
 
 #define safe_mutex_lock(lock) \
-    (pthread_mutex_lock(lock), \
-     pthread_cleanup_push((void (*)_((void *)))pthread_mutex_unlock, lock))
+    pthread_mutex_lock(lock); \
+    pthread_cleanup_push((void (*)_((void *)))pthread_mutex_unlock, lock)
 
 static void*
 thread_timer(dummy)
@@ -12055,25 +12055,6 @@ rb_thread_stop_timer()
     thread_init = 0;
 }
 
-void
-rb_child_atfork()
-{
-    time_thread_alive_p = 0;
-}
-
-void
-rb_thread_cancel_timer()
-{
-#ifdef _THREAD_SAFE
-    if( time_thread_alive_p )
-    {
-	pthread_cancel( time_thread );
-	pthread_join( time_thread, NULL );
-	time_thread_alive_p = 0;
-    }
-    thread_init = 0;
-#endif
-}
 #elif defined(HAVE_SETITIMER)
 static void
 catch_timer(sig)
@@ -12114,18 +12095,6 @@ rb_thread_stop_timer()
     thread_init = 0;
 }
 
-void
-rb_thread_cancel_timer()
-{
-}
-
-#else  /* !(_THREAD_SAFE || HAVE_SETITIMER) */
-int rb_thread_tick = THREAD_TICK;
-
-void
-rb_thread_cancel_timer()
-{
-}
 #endif
 
 static VALUE
diff --git a/process.c b/process.c
index 718b8ff67b..88beb6ef15 100644
--- a/process.c
+++ b/process.c
@@ -995,7 +995,6 @@ proc_exec_v(argv, prog)
     }
 #endif /* MSDOS or __human68k__ or __EMX__ */
     before_exec();
-    rb_thread_cancel_timer();
     execv(prog, argv);
     preserving_errno(after_exec());
     return -1;
diff --git a/version.h b/version.h
index 66464c457e..05bd94a2bf 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2010-02-04"
+#define RUBY_RELEASE_DATE "2010-02-05"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20100204
-#define RUBY_PATCHLEVEL 398
+#define RUBY_RELEASE_CODE 20100205
+#define RUBY_PATCHLEVEL 399
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];