From dae42ffe54b3b2e3f49c53a0d5235a3ee17f4894 Mon Sep 17 00:00:00 2001 From: Tatsuhiko Kubo Date: Sat, 3 Jan 2015 22:56:36 +0900 Subject: Removed duplicated declarations. * `mrb_show_version()` * `mrb_show_copyright()` --- include/mruby.h | 3 +++ mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c | 2 -- mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 3 --- mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 3 --- tools/mrbc/mrbc.c | 10 ---------- 5 files changed, 3 insertions(+), 18 deletions(-) diff --git a/include/mruby.h b/include/mruby.h index 68b0c5b79..c07bca462 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -439,6 +439,9 @@ MRB_API void* mrb_alloca(mrb_state *mrb, size_t); MRB_API void mrb_state_atexit(mrb_state *mrb, mrb_atexit_func func); +MRB_API void mrb_show_version(mrb_state *mrb); +MRB_API void mrb_show_copyright(mrb_state *mrb); + #ifdef MRB_DEBUG #include #define mrb_assert(p) assert(p) diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c index 5396e645e..5c7bd77e0 100755 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c @@ -19,8 +19,6 @@ #include "apibreak.h" #include "apilist.h" -void mrb_show_version(mrb_state *); -void mrb_show_copyright(mrb_state *); void mrdb_state_free(mrb_state *); static mrb_debug_context *_debug_context = NULL; diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index 6fafa340a..59f7fd5e6 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -193,9 +193,6 @@ is_code_block_open(struct mrb_parser_state *parser) return code_block_open; } -void mrb_show_version(mrb_state *); -void mrb_show_copyright(mrb_state *); - struct _args { mrb_bool verbose : 1; int argc; diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c index 247323b4e..442133f92 100644 --- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c +++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c @@ -24,9 +24,6 @@ p(mrb_state *mrb, mrb_value obj) #define p(mrb,obj) mrb_p(mrb,obj) #endif -void mrb_show_version(mrb_state *); -void mrb_show_copyright(mrb_state *); - struct _args { FILE *rfp; char* cmdline; diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c index 52e762a50..b51cc4da7 100644 --- a/tools/mrbc/mrbc.c +++ b/tools/mrbc/mrbc.c @@ -9,16 +9,6 @@ #define RITEBIN_EXT ".mrb" #define C_EXT ".c" -#if defined(__cplusplus) -extern "C" { -void mrb_show_version(mrb_state *); -void mrb_show_copyright(mrb_state *); -} -#else -void mrb_show_version(mrb_state *); -void mrb_show_copyright(mrb_state *); -#endif - struct mrbc_args { int argc; char **argv; -- cgit v1.2.3