mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
Merge pull request #5728 from artichoke/lopopolo/broken-extern-c-blocks-mrb-use-cxx-exception
Fix mismatched braces in `extern "C"` blocks when compiling as C++
This commit is contained in:
@@ -32,6 +32,12 @@ void abort(void);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(MRB_USE_CXX_EXCEPTION) && defined(__cplusplus)
|
||||
# if !defined(MRB_USE_CXX_ABI)
|
||||
extern "C" {
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#define STACK_INIT_SIZE 128
|
||||
#define CALLINFO_INIT_SIZE 32
|
||||
|
||||
@@ -3082,7 +3088,4 @@ mrb_top_run(mrb_state *mrb, const struct RProc *proc, mrb_value self, mrb_int st
|
||||
} /* end of extern "C" */
|
||||
# endif
|
||||
mrb_int mrb_jmpbuf::jmpbuf_id = 0;
|
||||
# if !defined(MRB_USE_CXX_ABI)
|
||||
extern "C" {
|
||||
# endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user