3 files changed, 6 insertions, 17 deletions
diff --git a/include/mruby.h b/include/mruby.h
index b81a7aa5f..970ef6a60 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -372,17 +372,6 @@ void mrb_gc_mark(mrb_state*,struct RBasic*);
 #define mrb_gc_mark_value(mrb,val) do {\
   if ((val).tt >= MRB_TT_OBJECT) mrb_gc_mark((mrb), mrb_object(val));\
 } while (0);
-void mrb_gc_mark_gv(mrb_state*);
-void mrb_gc_free_gv(mrb_state*);
-void mrb_gc_mark_iv(mrb_state*, struct RObject*);
-size_t mrb_gc_mark_iv_size(mrb_state*, struct RObject*);
-void mrb_gc_free_iv(mrb_state*, struct RObject*);
-void mrb_gc_mark_mt(mrb_state*, struct RClass*);
-size_t mrb_gc_mark_mt_size(mrb_state*, struct RClass*);
-void mrb_gc_free_mt(mrb_state*, struct RClass*);
-void mrb_gc_mark_ht(mrb_state*, struct RClass*);
-size_t mrb_gc_mark_ht_size(mrb_state*, struct RClass*);
-void mrb_gc_free_ht(mrb_state*, struct RClass*);
 void mrb_field_write_barrier(mrb_state *, struct RBasic*, struct RBasic*);
 #define mrb_field_write_barrier_value(mrb, obj, val) do{\
   if ((val.tt >= MRB_TT_OBJECT)) mrb_field_write_barrier((mrb), (obj), mrb_object(val));\
diff --git a/include/mruby/data.h b/include/mruby/data.h
index f839389f9..d4ce82e40 100644
--- a/include/mruby/data.h
+++ b/include/mruby/data.h
@@ -38,6 +38,7 @@ struct RData *mrb_data_object_alloc(mrb_state *mrb, struct RClass* klass, void *
 #define RDATA(obj)         ((struct RData *)((obj).value.p))
 #define DATA_PTR(d)        (RDATA(d)->data)
 #define DATA_TYPE(d)       (RDATA(d)->type)
+void *mrb_get_datatype(mrb_state *mrb, mrb_value, const struct mrb_data_type*);
 void *mrb_check_datatype(mrb_state *mrb, mrb_value, const struct mrb_data_type*);
 #define Data_Get_Struct(mrb,obj,type,sval) do {\
   sval = mrb_check_datatype(mrb, obj, type); \
diff --git a/include/mruby/hash.h b/include/mruby/hash.h
index 94f6a693f..3a15ecd1d 100644
--- a/include/mruby/hash.h
+++ b/include/mruby/hash.h
@@ -9,8 +9,8 @@
 
 struct RHash {
   MRUBY_OBJECT_HEADER;
+  struct kh_iv *iv;
   struct kh_ht *ht;
-  mrb_value ifnone;
 };
 
 #define N 624
@@ -47,12 +47,11 @@ void ruby_setenv(mrb_state *mrb, const char *name, const char *value);
 
 /* RHASH_TBL allocates st_table if not available. */
 #define RHASH(obj)   ((struct RHash*)((obj).value.p))
-#define RHASH_TBL(h) mrb_hash_tbl(h)
-#define RHASH_H_TBL(h)        (RHASH(h)->ht)
-#define RHASH_SIZE(h)         (RHASH_H_TBL(h)->size)
+#define RHASH_TBL(h)          (RHASH(h)->ht)
+#define RHASH_SIZE(h)         (RHASH_TBL(h)->size)
 #define RHASH_EMPTY_P(h)      (RHASH_SIZE(h) == 0)
-#define RHASH_IFNONE(h)       (RHASH(h)->ifnone)
-#define RHASH_PROCDEFAULT(h)  (RHASH(h)->ifnone)
+#define RHASH_IFNONE(h)       mrb_iv_get(mrb, (h), mrb_intern(mrb, "ifnone"))
+#define RHASH_PROCDEFAULT(h)  RHASH_IFNONE(h)
 struct kh_ht * mrb_hash_tbl(mrb_state *mrb, mrb_value hash);
 
 #define MRB_HASH_PROC_DEFAULT 256