diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backtrace.c | 2 | ||||
| -rw-r--r-- | src/class.c | 2 | ||||
| -rw-r--r-- | src/etc.c | 4 | ||||
| -rw-r--r-- | src/kernel.c | 2 | ||||
| -rw-r--r-- | src/object.c | 2 | ||||
| -rw-r--r-- | src/vm.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/backtrace.c b/src/backtrace.c index a8ba9cf24..4ad792a5e 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -85,7 +85,7 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun pc = mrb->c->cibase[i+1].pc; } else { - pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "lastpc", 6))); + pc = (mrb_code*)mrb_cptr(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "lastpc", 6))); } filename = mrb_debug_get_filename(irep, pc - irep->iseq - 1); line = mrb_debug_get_line(irep, pc - irep->iseq - 1); diff --git a/src/class.c b/src/class.c index e04aa5ce8..2fc14b2b8 100644 --- a/src/class.c +++ b/src/class.c @@ -933,7 +933,7 @@ mrb_singleton_class(mrb_state *mrb, mrb_value v) return mrb_obj_value(mrb->false_class); case MRB_TT_TRUE: return mrb_obj_value(mrb->true_class); - case MRB_TT_VOIDP: + case MRB_TT_CPTR: return mrb_obj_value(mrb->object_class); case MRB_TT_SYMBOL: case MRB_TT_FIXNUM: @@ -199,11 +199,11 @@ mrb_float_value(mrb_state *mrb, mrb_float f) } mrb_value -mrb_voidp_value(mrb_state *mrb, void *p) +mrb_cptr_value(mrb_state *mrb, void *p) { mrb_value v; - v.value.p = mrb_obj_alloc(mrb, MRB_TT_VOIDP, mrb->object_class); + v.value.p = mrb_obj_alloc(mrb, MRB_TT_CPTR, mrb->object_class); v.value.vp->p = p; return v; } diff --git a/src/kernel.c b/src/kernel.c index ce3aa89f0..bd58078fe 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -922,7 +922,7 @@ mrb_f_raise(mrb_state *mrb, mrb_value self) /* fall through */ default: exc = mrb_make_exception(mrb, argc, a); - mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern2(mrb, "lastpc", 6), mrb_voidp_value(mrb, mrb->c->ci->pc)); + mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern2(mrb, "lastpc", 6), mrb_cptr_value(mrb, mrb->c->ci->pc)); mrb_exc_raise(mrb, exc); break; } diff --git a/src/object.c b/src/object.c index 363f474f7..1040a08ed 100644 --- a/src/object.c +++ b/src/object.c @@ -436,7 +436,7 @@ mrb_any_to_s(mrb_state *mrb, mrb_value obj) mrb_str_buf_cat(mrb, str, "#<", 2); mrb_str_cat2(mrb, str, cname); mrb_str_cat(mrb, str, ":", 1); - mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_voidp(obj))); + mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_cptr(obj))); mrb_str_buf_cat(mrb, str, ">", 1); return str; @@ -1250,7 +1250,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) L_RAISE: ci = mrb->c->ci; - mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern2(mrb, "lastpc", 6), mrb_voidp_value(mrb, pc)); + mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern2(mrb, "lastpc", 6), mrb_cptr_value(mrb, pc)); mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern2(mrb, "ciidx", 5), mrb_fixnum_value(ci - mrb->c->cibase)); eidx = ci->eidx; if (ci == mrb->c->cibase) { |