summaryrefslogtreecommitdiffhomepage
path: root/src/state.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-07-27 02:53:02 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-07-27 02:53:02 +0900
commite488393cbbdd4fd123d71c6c3bd067f1eee5c37a (patch)
treebcdb115f19288cfb5f4af14493c350233b29350f /src/state.c
parent63e5a3cfb10e238eaab2a77bcc83acd0d41e60fa (diff)
parentf6d686eae0fce7d93426e0eb188cdc9658dfee75 (diff)
downloadmruby-e488393cbbdd4fd123d71c6c3bd067f1eee5c37a.tar.gz
mruby-e488393cbbdd4fd123d71c6c3bd067f1eee5c37a.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/state.c')
-rw-r--r--src/state.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/state.c b/src/state.c
index 34de1e45e..5dcc4a40a 100644
--- a/src/state.c
+++ b/src/state.c
@@ -21,10 +21,6 @@ inspect_main(mrb_state *mrb, mrb_value mod)
return mrb_str_new(mrb, "main", 4);
}
-#ifdef MRB_NAN_BOXING
-#include <assert.h>
-#endif
-
mrb_state*
mrb_open_allocf(mrb_allocf f, void *ud)
{
@@ -33,7 +29,7 @@ mrb_open_allocf(mrb_allocf f, void *ud)
mrb_state *mrb;
#ifdef MRB_NAN_BOXING
- assert(sizeof(void*) == 4);
+ mrb_assert(sizeof(void*) == 4);
#endif
mrb = (mrb_state *)(f)(NULL, NULL, sizeof(mrb_state), ud);
@@ -192,7 +188,7 @@ mrb_value
mrb_top_self(mrb_state *mrb)
{
if (!mrb->top_self) {
- mrb->top_self = (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mrb->object_class);
+ mrb->top_self = (struct RObject*)mrb_obj_alloc(mrb, MRB_TT_OBJECT, mrb->object_class);
mrb_define_singleton_method(mrb, mrb->top_self, "inspect", inspect_main, MRB_ARGS_NONE());
mrb_define_singleton_method(mrb, mrb->top_self, "to_s", inspect_main, MRB_ARGS_NONE());
}