diff options
| author | Mike Pall <mike> | 2010-11-16 14:06:59 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2010-11-16 15:03:40 +0100 |
| commit | 24baf7795574ca40be2c2be8da8cd483551a546a (patch) | |
| tree | e3e2629947dc8c8bd2d25d7a6c9ab7db54f814a1 /src/lj_err.c | |
| parent | 1de05d1147a6fe69b55111d605eccdedc8c6c993 (diff) | |
| download | luajit-24baf7795574ca40be2c2be8da8cd483551a546a.tar.gz luajit-24baf7795574ca40be2c2be8da8cd483551a546a.tar.bz2 luajit-24baf7795574ca40be2c2be8da8cd483551a546a.zip | |
Cleanup architecture, ABI and OS definitions.
Diffstat (limited to 'src/lj_err.c')
| -rw-r--r-- | src/lj_err.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lj_err.c b/src/lj_err.c index 5a6aac83..8a80c9c8 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -63,15 +63,11 @@ | |||
| 63 | ** EXT is mandatory on POSIX/x64 since the interpreter doesn't save r12/r13. | 63 | ** EXT is mandatory on POSIX/x64 since the interpreter doesn't save r12/r13. |
| 64 | */ | 64 | */ |
| 65 | 65 | ||
| 66 | #if defined(__GNUC__) | 66 | #if defined(__GNUC__) && (LJ_TARGET_X64 || defined(LUAJIT_UNWIND_EXTERNAL)) |
| 67 | #if LJ_TARGET_X64 || defined(LUAJIT_UNWIND_EXTERNAL) | ||
| 68 | #define LJ_UNWIND_EXT 1 | 67 | #define LJ_UNWIND_EXT 1 |
| 69 | #endif | 68 | #elif LJ_TARGET_X64 && LJ_TARGET_WINDOWS |
| 70 | #elif defined(LUA_USE_WIN) | ||
| 71 | #if LJ_TARGET_X64 | ||
| 72 | #define LJ_UNWIND_EXT 1 | 69 | #define LJ_UNWIND_EXT 1 |
| 73 | #endif | 70 | #endif |
| 74 | #endif | ||
| 75 | 71 | ||
| 76 | /* -- Error messages ------------------------------------------------------ */ | 72 | /* -- Error messages ------------------------------------------------------ */ |
| 77 | 73 | ||
| @@ -604,7 +600,7 @@ static void err_raise_ext(int errcode) | |||
| 604 | } | 600 | } |
| 605 | #endif | 601 | #endif |
| 606 | 602 | ||
| 607 | #elif defined(_WIN64) | 603 | #elif LJ_TARGET_X64 && LJ_TARGET_WINDOWS |
| 608 | 604 | ||
| 609 | /* | 605 | /* |
| 610 | ** Someone in Redmond owes me several days of my life. A lot of this is | 606 | ** Someone in Redmond owes me several days of my life. A lot of this is |