summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--compile.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4538e3959a..955bfe7dbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 12 22:51:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * compile.c (hide_obj): OBJ_FREEZE() is not an expression. a patch
+ from nagachika <nagachika00 AT gmail.com> at [ruby-dev:37977].
+
+ * compile.c (insn_set_sc_state): fixed typoe.
+
Thu Feb 12 12:36:35 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/basicsocket.c (bsock_getpeereid): implemented for Solaris
diff --git a/compile.c b/compile.c
index 05572233ad..4a60785887 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;
}