diff options
| author | Mike Pall <mike> | 2015-06-09 22:09:11 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-06-09 22:09:11 +0200 |
| commit | fb19df9fd765ce7384e2e28cec78b3c30a10d5ee (patch) | |
| tree | a3e6b0811cf37b6eb7fc720fc56e7e1c8222b06c /src/lj_arch.h | |
| parent | 4da1bb66cdd20e868dae42d2c544280ec1b9fa76 (diff) | |
| parent | 72347895edbdc8730c1e758bfee4264fd60164ac (diff) | |
| download | luajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.tar.gz luajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.tar.bz2 luajit-fb19df9fd765ce7384e2e28cec78b3c30a10d5ee.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_arch.h')
| -rw-r--r-- | src/lj_arch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index 442ba4fc..96e9a99e 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
| @@ -489,7 +489,7 @@ | |||
| 489 | #define LUAJIT_NO_EXP2 | 489 | #define LUAJIT_NO_EXP2 |
| 490 | #endif | 490 | #endif |
| 491 | 491 | ||
| 492 | #if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 | 492 | #if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4 |
| 493 | #define LJ_NO_UNWIND 1 | 493 | #define LJ_NO_UNWIND 1 |
| 494 | #endif | 494 | #endif |
| 495 | 495 | ||