diff options
| author | Mike Pall <mike> | 2019-12-08 19:24:47 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2019-12-08 19:24:47 +0100 |
| commit | 05898a8824f119d586e5fb079f1e66d8cac38160 (patch) | |
| tree | 615a53149d3c0c4a1de3feb2e63e06bb8761b059 /src/lj_err.c | |
| parent | 84ee8091f66b674da74e6f81bcb73f1d9fb10458 (diff) | |
| parent | 44382e833a9334c19e47e64e8078a322026e094d (diff) | |
| download | luajit-05898a8824f119d586e5fb079f1e66d8cac38160.tar.gz luajit-05898a8824f119d586e5fb079f1e66d8cac38160.tar.bz2 luajit-05898a8824f119d586e5fb079f1e66d8cac38160.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_err.c')
| -rw-r--r-- | src/lj_err.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/lj_err.c b/src/lj_err.c index abf176e5..83118551 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -287,12 +287,7 @@ LJ_FUNCA int lj_err_unwind_dwarf(int version, int actions, | |||
| 287 | } | 287 | } |
| 288 | 288 | ||
| 289 | #if LJ_UNWIND_EXT | 289 | #if LJ_UNWIND_EXT |
| 290 | #if LJ_TARGET_OSX || defined(__OpenBSD__) | ||
| 291 | /* Sorry, no thread safety for OSX. Complain to Apple, not me. */ | ||
| 292 | static _Unwind_Exception static_uex; | ||
| 293 | #else | ||
| 294 | static __thread _Unwind_Exception static_uex; | 290 | static __thread _Unwind_Exception static_uex; |
| 295 | #endif | ||
| 296 | 291 | ||
| 297 | /* Raise DWARF2 exception. */ | 292 | /* Raise DWARF2 exception. */ |
| 298 | static void err_raise_ext(int errcode) | 293 | static void err_raise_ext(int errcode) |