diff options
author | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-04 22:30:33 +0000 |
---|---|---|
committer | wyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-04 22:30:33 +0000 |
commit | eacf387c6c847d2905e688b976112704ee6bf819 (patch) | |
tree | 379ba9ec32e6409078b1ba69566cf03536d7e968 /eval.c | |
parent | 00c2b61f0dc38b87d46983f33a7d1867d38801f8 (diff) |
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
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 35 |
1 files changed, 2 insertions, 33 deletions
@@ -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 |