Skip to content

Commit

Permalink
Pull in upstream mruby fix to compile mruby as C++
Browse files Browse the repository at this point in the history
  • Loading branch information
lopopolo committed Jun 28, 2022
1 parent c3c2e39 commit ffd6a0c
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions artichoke-backend/vendor/mruby/src/vm.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,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

Expand Down Expand Up @@ -3066,7 +3072,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

0 comments on commit ffd6a0c

Please sign in to comment.