diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:01:02 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:01:02 +0000 |
commit | 2e52bda3c823718e3a6a7b3465bb2ce22f8c7e53 (patch) | |
tree | a7f4e6e0be566e5c666733fca54ed60875e53afe /thread_pthread.c | |
parent | b1d964358477d252e88481e1f1df683cfe8499f3 (diff) |
merges r20593 from trunk into ruby_1_9_1.
* compile.c (iseq_compile_each), gc.c (assign_heap_slot),
(gc_mark_children), parse.y (vtable_alloc, vtable_free, vtable_add),
proc.c (proc_to_s), thread.c (terminate_i, rb_thread_terminate_all),
(thread_start_func_2, blocking_region_begin, blocking_region_end),
(rb_thread_kill), thread_pthread.c (native_thread_create),
(ubf_pthread_cond_signal), vm.c (check_env, thread_free), vm_dump.c
(vm_env_dump_raw, vm_stack_dump_each, vm_thread_dump_state),
(vm_call0): use void pointer for %p.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_pthread.c')
-rw-r--r-- | thread_pthread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/thread_pthread.c b/thread_pthread.c index a492d7f02d..a23e7727db 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -461,7 +461,7 @@ native_thread_create(rb_thread_t *th) int err = 0; if (use_cached_thread(th)) { - thread_debug("create (use cached thread): %p\n", th); + thread_debug("create (use cached thread): %p\n", (void *)th); } else { pthread_attr_t attr; @@ -494,7 +494,7 @@ native_thread_create(rb_thread_t *th) CHECK_ERR(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED)); err = pthread_create(&th->thread_id, &attr, thread_start_func_1, th); - thread_debug("create: %p (%d)", th, err); + thread_debug("create: %p (%d)", (void *)th, err); CHECK_ERR(pthread_attr_destroy(&attr)); if (!err) { @@ -553,7 +553,7 @@ static void ubf_pthread_cond_signal(void *ptr) { rb_thread_t *th = (rb_thread_t *)ptr; - thread_debug("ubf_pthread_cond_signal (%p)\n", th); + thread_debug("ubf_pthread_cond_signal (%p)\n", (void *)th); pthread_cond_signal(&th->native_thread_data.sleep_cond); } |