diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-11-05 00:13:01 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-11-05 00:13:01 +0900 |
| commit | f80401de6c9b7dd9e0676c4414aae7a6e033ac5f (patch) | |
| tree | 27663cfee57ca8652671087e01b99d69f814a32a /include/mruby.h | |
| parent | e386760cc7b7958a8948b0a23b35b3a9df30c354 (diff) | |
| parent | 82c5b486e0d788aa7a391574c59959da2216990e (diff) | |
| download | mruby-f80401de6c9b7dd9e0676c4414aae7a6e033ac5f.tar.gz mruby-f80401de6c9b7dd9e0676c4414aae7a6e033ac5f.zip | |
resolved conflicts and updated to latest return value change of mrb_generate_code()
Diffstat (limited to 'include/mruby.h')
| -rw-r--r-- | include/mruby.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mruby.h b/include/mruby.h index b3dc59a08..445bc5e11 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -261,6 +261,7 @@ void mrb_close(mrb_state*); mrb_value mrb_top_self(mrb_state *); mrb_value mrb_run(mrb_state*, struct RProc*, mrb_value); +mrb_value mrb_context_run(mrb_state*, struct RProc*, mrb_value, unsigned int); void mrb_p(mrb_state*, mrb_value); mrb_int mrb_obj_id(mrb_value obj); |