summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-05-20 14:53:42 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-05-20 14:53:42 +0900
commit3cbae5354149d311f6740c99474a96f4d1d8bca1 (patch)
treef2158c90fd9074b41f2228b8debce7d169f2ce54
parent7195600dbf8d1683bcc5e9bfc3dd8547c222694e (diff)
downloadmruby-3cbae5354149d311f6740c99474a96f4d1d8bca1.tar.gz
mruby-3cbae5354149d311f6740c99474a96f4d1d8bca1.zip
move prototype of mrb_format() from error.h to mruby.h; ref #2274
-rw-r--r--include/mruby.h2
-rw-r--r--include/mruby/error.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 3b1425cce..c1f45bf0b 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -422,6 +422,8 @@ void* mrb_alloca(mrb_state *mrb, size_t);
#define mrb_assert_int_fit(t1,n,t2,max) ((void)0)
#endif
+mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
+
#if defined(__cplusplus)
} /* extern "C" { */
#endif
diff --git a/include/mruby/error.h b/include/mruby/error.h
index 9dd4260c2..7ae2d4348 100644
--- a/include/mruby/error.h
+++ b/include/mruby/error.h
@@ -15,7 +15,6 @@ void mrb_sys_fail(mrb_state *mrb, const char *mesg);
mrb_value mrb_exc_new_str(mrb_state *mrb, struct RClass* c, mrb_value str);
#define mrb_exc_new_str_lit(mrb, c, lit) mrb_exc_new_str(mrb, c, mrb_str_new_lit(mrb, lit))
mrb_value mrb_make_exception(mrb_state *mrb, int argc, const mrb_value *argv);
-mrb_value mrb_format(mrb_state *mrb, const char *format, ...);
void mrb_exc_print(mrb_state *mrb, struct RObject *exc);
void mrb_print_backtrace(mrb_state *mrb);
mrb_value mrb_exc_backtrace(mrb_state *mrb, mrb_value exc);