summaryrefslogtreecommitdiffhomepage
path: root/src/state.c
diff options
context:
space:
mode:
authormirichi <[email protected]>2013-06-14 20:01:03 +0900
committermirichi <[email protected]>2013-06-14 20:01:03 +0900
commita5f63e486473595d67601851f00b6bb96b377a8d (patch)
tree8550bf598238104c6490d15ad2db20d4c103ea75 /src/state.c
parent4b2bdbe2cc0e3b1b0f6916bdc308933f17f74537 (diff)
parentdbc93621c94b9b2d2b437cde40d8efec7337a64d (diff)
downloadmruby-a5f63e486473595d67601851f00b6bb96b377a8d.tar.gz
mruby-a5f63e486473595d67601851f00b6bb96b377a8d.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/state.c')
-rw-r--r--src/state.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/state.c b/src/state.c
index 76b506d3e..34de1e45e 100644
--- a/src/state.c
+++ b/src/state.c
@@ -21,12 +21,22 @@ 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)
{
static const mrb_state mrb_state_zero = { 0 };
static const struct mrb_context mrb_context_zero = { 0 };
- mrb_state *mrb = (mrb_state *)(f)(NULL, NULL, sizeof(mrb_state), ud);
+ mrb_state *mrb;
+
+#ifdef MRB_NAN_BOXING
+ assert(sizeof(void*) == 4);
+#endif
+
+ mrb = (mrb_state *)(f)(NULL, NULL, sizeof(mrb_state), ud);
if (mrb == NULL) return NULL;
*mrb = mrb_state_zero;