diff --git a/ChangeLog b/ChangeLog
index 1c38396c11..e192ae8e63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 13 22:51:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* insns.def (opt_case_dispatch): use st_data_t.
+
 Wed Oct 13 22:32:34 2010  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
 
 	* lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte
diff --git a/insns.def b/insns.def
index 62d0df40a1..89301e87b2 100644
--- a/insns.def
+++ b/insns.def
@@ -1272,9 +1272,9 @@ opt_case_dispatch
       case T_BIGNUM:
       case T_STRING:
 	if (BASIC_OP_UNREDEFINED_P(BOP_EQQ)) {
-	    VALUE val;
+	    st_data_t val;
 	    if (st_lookup(RHASH_TBL(hash), key, &val)) {
-		JUMP(FIX2INT(val));
+		JUMP(FIX2INT((VALUE)val));
 	    }
 	    else {
 		JUMP(else_offset);