Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2019-12-08 19:24:47 +01:00
3 changed files with 6 additions and 10 deletions

View File

@@ -287,12 +287,7 @@ LJ_FUNCA int lj_err_unwind_dwarf(int version, int actions,
}
#if LJ_UNWIND_EXT
#if LJ_TARGET_OSX || defined(__OpenBSD__)
/* Sorry, no thread safety for OSX. Complain to Apple, not me. */
static _Unwind_Exception static_uex;
#else
static __thread _Unwind_Exception static_uex;
#endif
/* Raise DWARF2 exception. */
static void err_raise_ext(int errcode)