summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 01:01:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 01:01:02 +0000
commit2e52bda3c823718e3a6a7b3465bb2ce22f8c7e53 (patch)
treea7f4e6e0be566e5c666733fca54ed60875e53afe /proc.c
parentb1d964358477d252e88481e1f1df683cfe8499f3 (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 'proc.c')
-rw-r--r--proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/proc.c b/proc.c
index b383d85d8e..c732917fd8 100644
--- a/proc.c
+++ b/proc.c
@@ -733,7 +733,7 @@ proc_to_s(VALUE self)
line_no, is_lambda);
}
else {
- str = rb_sprintf("#<%s:%p%s>", cname, proc->block.iseq,
+ str = rb_sprintf("#<%s:%p%s>", cname, (void *)proc->block.iseq,
is_lambda);
}