5 files changed, 9 insertions, 6 deletions
diff --git a/include/mruby.h b/include/mruby.h
index e204820a3..5272d0400 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -125,6 +125,7 @@ typedef struct mrb_state {
   mrb_bool gc_disabled:1;
   mrb_bool gc_full:1;
   mrb_bool is_generational_gc_mode:1;
+  mrb_bool out_of_memory:1;
   size_t majorgc_old_threshold;
   struct alloca_header *mems;
 
diff --git a/include/mruby/dump.h b/include/mruby/dump.h
index 2533a4c93..d1d097cd2 100644
--- a/include/mruby/dump.h
+++ b/include/mruby/dump.h
@@ -141,9 +141,8 @@ bin_to_uint8(const uint8_t *bin)
 }
 
 /* crc.c */
-uint32_t
-calc_crc_16_ccitt(const uint8_t *src, uint32_t nbytes, uint16_t crcwk);
-
+uint16_t
+calc_crc_16_ccitt(const uint8_t *src, size_t nbytes, uint16_t crc);
 #if defined(__cplusplus)
 }  /* extern "C" { */
 #endif
diff --git a/include/mruby/numeric.h b/include/mruby/numeric.h
index 4bcb43966..aac7b9920 100644
--- a/include/mruby/numeric.h
+++ b/include/mruby/numeric.h
@@ -15,8 +15,10 @@ extern "C" {
 #define NEGFIXABLE(f) ((f) >= MRB_INT_MIN)
 #define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
 
-mrb_value mrb_flt2big(mrb_state *mrb, mrb_float d);
-mrb_value mrb_fix2str(mrb_state *mrb, mrb_value x, int base);
+mrb_value mrb_flo_to_fixnum(mrb_state *mrb, mrb_value val);
+mrb_value mrb_flo_to_str(mrb_state *mrb, mrb_value flo, int max_digit);
+
+mrb_value mrb_fixnum_to_str(mrb_state *mrb, mrb_value x, int base);
 
 mrb_value mrb_fixnum_plus(mrb_state *mrb, mrb_value x, mrb_value y);
 mrb_value mrb_fixnum_minus(mrb_state *mrb, mrb_value x, mrb_value y);
diff --git a/include/mruby/value.h b/include/mruby/value.h
index 1815f0562..1cc5263ad 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -42,7 +42,7 @@ typedef struct mrb_value {
     mrb_int i;
     mrb_sym sym;
   } value;
-  enum mrb_vtype tt:8;
+  enum mrb_vtype tt;
 } mrb_value;
 
 #define mrb_type(o)   (o).tt
diff --git a/include/mruby/variable.h b/include/mruby/variable.h
index f699f5dfd..2845e0daa 100644
--- a/include/mruby/variable.h
+++ b/include/mruby/variable.h
@@ -49,6 +49,7 @@ mrb_bool mrb_iv_defined(mrb_state*, mrb_value, mrb_sym);
 mrb_value mrb_iv_remove(mrb_state *mrb, mrb_value obj, mrb_sym sym);
 void mrb_iv_copy(mrb_state *mrb, mrb_value dst, mrb_value src);
 int mrb_const_defined_at(mrb_state *mrb, struct RClass *klass, mrb_sym id);
+mrb_value mrb_mod_constants(mrb_state *mrb, mrb_value mod);
 mrb_value mrb_f_global_variables(mrb_state *mrb, mrb_value self);
 mrb_value mrb_gv_get(mrb_state *mrb, mrb_sym sym);
 void mrb_gv_set(mrb_state *mrb, mrb_sym sym, mrb_value val);