summaryrefslogtreecommitdiff
path: root/parse.y
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 /parse.y
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 'parse.y')
-rw-r--r--parse.y8
1 files changed, 4 insertions, 4 deletions
diff --git a/parse.y b/parse.y
index 63f5e3c929..72d1b1d31d 100644
--- a/parse.y
+++ b/parse.y
@@ -129,14 +129,14 @@ vtable_alloc(struct vtable *prev)
tbl->capa = 8;
tbl->tbl = ALLOC_N(ID, tbl->capa);
tbl->prev = prev;
- if (VTBL_DEBUG) printf("vtable_alloc: %p\n", tbl);
+ if (VTBL_DEBUG) printf("vtable_alloc: %p\n", (void *)tbl);
return tbl;
}
static void
vtable_free(struct vtable *tbl)
{
- if (VTBL_DEBUG)printf("vtable_free: %p\n", tbl);
+ if (VTBL_DEBUG)printf("vtable_free: %p\n", (void *)tbl);
if (POINTER_P(tbl)) {
if (tbl->tbl) {
xfree(tbl->tbl);
@@ -149,9 +149,9 @@ static void
vtable_add(struct vtable *tbl, ID id)
{
if (!POINTER_P(tbl)) {
- rb_bug("vtable_add: vtable is not allocated (%p)", tbl);
+ rb_bug("vtable_add: vtable is not allocated (%p)", (void *)tbl);
}
- if (VTBL_DEBUG) printf("vtable_add: %p, %s\n", tbl, rb_id2name(id));
+ if (VTBL_DEBUG) printf("vtable_add: %p, %s\n", (void *)tbl, rb_id2name(id));
if (tbl->pos == tbl->capa) {
tbl->capa = tbl->capa * 2;