From b8b7030cc433d408eaf30c0fc67a2e3c8c7180c0 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 22 Feb 2009 12:49:21 +0000 Subject: merges r22259 from trunk into ruby_1_9_1. * compile.c (hide_obj): OBJ_FREEZE() is not an expression. a patch from nagachika at [ruby-dev:37977]. * compile.c (insn_set_sc_state): fixed typoe. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compile.c') diff --git a/compile.c b/compile.c index 768006afa..cfe2edcc3 100644 --- a/compile.c +++ b/compile.c @@ -295,7 +295,7 @@ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2); #define INIT_ANCHOR(name) \ (name##_body__.last = &name##_body__.anchor, name = &name##_body__) -#define hide_obj(obj) (void)(OBJ_FREEZE(obj), RBASIC(obj)->klass = 0) +#define hide_obj(obj) do {OBJ_FREEZE(obj); RBASIC(obj)->klass = 0;} while (0) #include "optinsn.inc" #if OPT_INSTRUCTIONS_UNIFICATION @@ -1978,7 +1978,7 @@ insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state) dump_disasm_list((LINK_ELEMENT *)iobj); dump_disasm_list((LINK_ELEMENT *)lobj); printf("\n-- %d, %d\n", lobj->sc_state, nstate); - rb_compile_error(RSTRING_PTR(iseq->filename), iobj->lineno, + rb_compile_error(RSTRING_PTR(iseq->filename), iobj->line_no, "insn_set_sc_state error\n"); return 0; } -- cgit