summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-03-02 20:38:16 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2017-03-02 20:42:06 +0900
commitffdf7be7235717fb1cd30e54c24c5383f705f110 (patch)
tree86e0b745b1c15065f30118764fde0c415260df65
parent2d858cab3dbdb3f61d07f3850903702456909afc (diff)
downloadmruby-ffdf7be7235717fb1cd30e54c24c5383f705f110.tar.gz
mruby-ffdf7be7235717fb1cd30e54c24c5383f705f110.zip
Define jmpbuf_id outside of `extern "C"`; ref #3470
-rw-r--r--src/vm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/vm.c b/src/vm.c
index 8c9a021aa..251ee15bc 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -2579,5 +2579,11 @@ mrb_top_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int sta
}
#if defined(MRB_ENABLE_CXX_EXCEPTION) && defined(__cplusplus)
+# if !defined(MRB_ENABLE_CXX_ABI)
+} /* end of extern "C" */
+# endif
mrb_int mrb_jmpbuf::jmpbuf_id = 0;
+# if !defined(MRB_ENABLE_CXX_ABI)
+extern "C" {
+# endif
#endif