From 38766319e181e6cdbd3f7bb14f8cc9736f4d6c9e Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 3 Dec 2012 05:14:50 +0000
Subject: * compile.c (iseq_compile_each): joke shouldn't use id.h defined ids.
 * id.c (Init_id): ditto. * common.mk: fix dpendency.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 compile.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'compile.c')

diff --git a/compile.c b/compile.c
index a93a230af5..5412beef7a 100644
--- a/compile.c
+++ b/compile.c
@@ -4222,11 +4222,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	INIT_ANCHOR(args);
 #if SUPPORT_JOKE
 	if (nd_type(node) == NODE_VCALL) {
-	    if (mid == idBitblt) {
+	    ID id_bitblt;
+	    ID id_answer;
+
+	    CONST_ID(id_bitblt, "bitblt");
+	    CONST_ID(id_answer, "the_answer_to_life_the_universe_and_everything");
+
+	    if (mid == id_bitblt) {
 		ADD_INSN(ret, nd_line(node), bitblt);
 		break;
 	    }
-	    else if (mid == idAnswer) {
+	    else if (mid == id_answer) {
 		ADD_INSN(ret, nd_line(node), answer);
 		break;
 	    }
-- 
cgit v1.2.3