diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-22 08:22:18 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-05-22 08:22:18 +0900 |
| commit | 267eb74abc721522a89dcfbfa74c7a8163c70956 (patch) | |
| tree | 7be2da0e4fc46ca7b4191e004dbf155086e09a51 /src | |
| parent | 69a094dc244acb8209cb3bdfc6da82a9f8323841 (diff) | |
| parent | f25897cd05297f8b266dcf0414add8c3c415ec4b (diff) | |
| download | mruby-267eb74abc721522a89dcfbfa74c7a8163c70956.tar.gz mruby-267eb74abc721522a89dcfbfa74c7a8163c70956.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel.c | 2 | ||||
| -rw-r--r-- | src/range.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel.c b/src/kernel.c index 09b56828d..6d13bb6e9 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -182,7 +182,7 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self) bp = ci->stackent + 1; ci--; if (ci <= mrb->c->cibase) { - given_p = 0; + given_p = FALSE; } else { /* block_given? called within block; check upper scope */ diff --git a/src/range.c b/src/range.c index e162fb63f..53000e660 100644 --- a/src/range.c +++ b/src/range.c @@ -38,8 +38,8 @@ mrb_range_new(mrb_state *mrb, mrb_value beg, mrb_value end, mrb_bool excl) { struct RRange *r; - r = (struct RRange*)mrb_obj_alloc(mrb, MRB_TT_RANGE, RANGE_CLASS); range_check(mrb, beg, end); + r = (struct RRange*)mrb_obj_alloc(mrb, MRB_TT_RANGE, RANGE_CLASS); r->edges = (mrb_range_edges *)mrb_malloc(mrb, sizeof(mrb_range_edges)); r->edges->beg = beg; r->edges->end = end; |