diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-16 15:18:52 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-04-16 15:18:52 +0900 |
| commit | 3e00684faaeadb83bad6512ece109e84f8dd7f95 (patch) | |
| tree | 3af7bdd5c3c0e56ca8087965afa0d1b597159e32 /src | |
| parent | c136d871b99644c9593bd73a51e026d3f9257e7f (diff) | |
| download | mruby-3e00684faaeadb83bad6512ece109e84f8dd7f95.tar.gz mruby-3e00684faaeadb83bad6512ece109e84f8dd7f95.zip | |
resolve conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/error.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/error.c b/src/error.c index 64851bb56..feec9dbc5 100644 --- a/src/error.c +++ b/src/error.c @@ -215,7 +215,7 @@ exc_debug_info(mrb_state *mrb, struct RObject *exc) } } -void +mrb_noreturn void mrb_exc_raise(mrb_state *mrb, mrb_value exc) { mrb->exc = mrb_obj_ptr(exc); @@ -227,7 +227,7 @@ mrb_exc_raise(mrb_state *mrb, mrb_value exc) MRB_THROW(mrb->jmp); } -void +mrb_noreturn void mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg) { mrb_value mesg; @@ -289,7 +289,7 @@ mrb_format(mrb_state *mrb, const char *format, ...) return str; } -void +mrb_noreturn void mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...) { va_list args; @@ -301,7 +301,7 @@ mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...) mrb_exc_raise(mrb, mrb_exc_new_str(mrb, c, mesg)); } -void +mrb_noreturn void mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...) { mrb_value exc; @@ -332,7 +332,7 @@ mrb_warn(mrb_state *mrb, const char *fmt, ...) #endif } -void +mrb_noreturn void mrb_bug(mrb_state *mrb, const char *fmt, ...) { #ifdef ENABLE_STDIO |