summaryrefslogtreecommitdiffhomepage
path: root/include/mruby.h
diff options
context:
space:
mode:
authorMitchell Blank Jr <[email protected]>2012-05-22 01:02:49 -0700
committerMitchell Blank Jr <[email protected]>2012-05-22 01:02:49 -0700
commit8c084b9645ddc376403aa6c32a3e703ecc28d400 (patch)
treeb536f3461a87f8e5044aff0c4b4035410065215a /include/mruby.h
parentdd5dd821aa17668ac9184a3d554b9309c7d7c041 (diff)
parentabacbf667241ff4919b14007ef1a704f321de96d (diff)
downloadmruby-8c084b9645ddc376403aa6c32a3e703ecc28d400.tar.gz
mruby-8c084b9645ddc376403aa6c32a3e703ecc28d400.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: src/time.c
Diffstat (limited to 'include/mruby.h')
-rw-r--r--include/mruby.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mruby.h b/include/mruby.h
index a39416e96..e3803bee0 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -162,7 +162,7 @@ mrb_nil_value()
mrb_value v;
v.tt = MRB_TT_FALSE;
- v.value.p = 0;
+ v.value.i = 0;
return v;
}