From 86831d5465cfd474d9183ec66471e91ff790e267 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Sat, 1 Mar 2014 18:00:38 +0900 Subject: move jmpbuf_id to generated file --- src/error.c | 4 ---- src/mruby_core.rake | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/error.c b/src/error.c index f7e5995e6..be47e1618 100644 --- a/src/error.c +++ b/src/error.c @@ -432,10 +432,6 @@ mrb_sys_fail(mrb_state *mrb, const char *mesg) } } -#ifdef MRB_ENABLE_CXX_EXCEPTION -mrb_int mrb_jmpbuf::jmpbuf_id = 0; -#endif - void mrb_init_exception(mrb_state *mrb) { diff --git a/src/mruby_core.rake b/src/mruby_core.rake index 7b244c8d3..2e6abfcd3 100644 --- a/src/mruby_core.rake +++ b/src/mruby_core.rake @@ -22,6 +22,9 @@ MRuby.each_target do extern "C" { #include "#{MRUBY_ROOT}/#{t.prerequisites.first}" } + + +#{v == 'error'? 'mrb_int mrb_jmpbuf::jmpbuf_id = 0;' : ''} EOS end end -- cgit v1.2.3