Merge branch 'master' of https://github.com/Archytaus/mruby into Archytaus-master

2 files changed, 18 insertions, 0 deletions

diff --git a/include/mruby/gc.h b/include/mruby/gc.h
new file mode 100644
index 000000000..2f7dc73cf
--- /dev/null
+++ b/include/mruby/gc.h
@@ -0,0 +1,16 @@
+/*
+** gc.h - garbage collector for mruby
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_GC_H
+#define MRUBY_GC_H
+
+#include "mruby.h"
+#include "mruby/value.h"
+
+typedef void (each_object_callback)(mrb_state *mrb, struct RBasic* obj, void *data);
+void mrb_objspace_each_objects(mrb_state *mrb, each_object_callback* callback, void *data);
+
+#endif  /* MRUBY_GC_H */
diff --git a/include/mruby/hash.h b/include/mruby/hash.h
index 68fbf5a76..c331db157 100644
--- a/include/mruby/hash.h
+++ b/include/mruby/hash.h
@@ -29,6 +29,8 @@ mrb_value mrb_hash_fetch(mrb_state *mrb, mrb_value hash, mrb_value key, mrb_valu
 mrb_value mrb_hash_delete_key(mrb_state *mrb, mrb_value hash, mrb_value key);
 mrb_value mrb_hash_keys(mrb_state *mrb, mrb_value hash);
 mrb_value mrb_check_hash_type(mrb_state *mrb, mrb_value hash);
+mrb_value mrb_hash_empty_p(mrb_state *mrb, mrb_value self);
+mrb_value mrb_hash_clear(mrb_state *mrb, mrb_value hash);
 
 /* RHASH_TBL allocates st_table if not available. */
 #define RHASH(obj)   ((struct RHash*)((obj).value.p))