summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorXuejie Xiao <[email protected]>2012-11-08 11:32:45 -0500
committerXuejie Xiao <[email protected]>2012-11-08 11:32:45 -0500
commit4bbf7a3e12af8a8c4d7a34c19b3147bd0ade4eed (patch)
tree893f289f31d74253a1d11447286d3a81cf8b4247
parent1c95f4eb82d525d7d5eacd214904d262554bf93d (diff)
downloadmruby-4bbf7a3e12af8a8c4d7a34c19b3147bd0ade4eed.tar.gz
mruby-4bbf7a3e12af8a8c4d7a34c19b3147bd0ade4eed.zip
Fix build on c++ compiler
-rw-r--r--src/gc.c2
-rw-r--r--src/state.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gc.c b/src/gc.c
index 374072ce5..3ee5da1f8 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -325,7 +325,7 @@ struct RBasic*
mrb_obj_alloc(mrb_state *mrb, enum mrb_vtype ttype, struct RClass *cls)
{
struct RBasic *p;
- static const RVALUE RVALUE_zero = { { { 0 } } };
+ static const RVALUE RVALUE_zero = { { { MRB_TT_FALSE } } };
#ifdef MRB_GC_STRESS
mrb_garbage_collect(mrb);
diff --git a/src/state.c b/src/state.c
index 8bd222fb5..db31d7037 100644
--- a/src/state.c
+++ b/src/state.c
@@ -53,7 +53,7 @@ mrb_alloca(mrb_state *mrb, size_t size)
{
struct alloca_header *p;
- p = mrb_malloc(mrb, sizeof(struct alloca_header)+size);
+ p = (struct alloca_header*) mrb_malloc(mrb, sizeof(struct alloca_header)+size);
p->next = mrb->mems;
mrb->mems = p;
return (void*)p->buf;