diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-18 10:44:55 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-18 10:44:55 +0000 |
| commit | 7a45568809251ea36af73a070f75925feae973a7 (patch) | |
| tree | 2c3fdc42122c9046ceaffa61b4a86a25ad44df06 | |
| parent | 9e59bd2d0ffb33d9bef7d943ee1020f8079b55e2 (diff) | |
* eval.c (safe_mutex_lock): pthread_cleanup_push() must not be
inside parens.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23202 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Apr 18 19:44:53 2009 Nobuyoshi Nakada <[email protected]> + + * eval.c (safe_mutex_lock): pthread_cleanup_push() must not be + inside parens. + Sat Apr 18 18:25:53 2009 Nobuyoshi Nakada <[email protected]> * eval.c (rb_thread_remove): stops timer thread unless other @@ -12383,8 +12383,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) |