diff options
| author | Mike Pall <mike> | 2015-10-24 19:03:14 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-10-24 19:03:14 +0200 |
| commit | ffb124ec77f7881de374c3f4dca8c418a89c6cbc (patch) | |
| tree | ece7b7d3423e79930a8e29c9c8c70e661236dec6 /src/lj_arch.h | |
| parent | 6a5441114e6f38e340a5a38cbef735ab923074b8 (diff) | |
| parent | 3639ff41420610969f44eceebac11253ff7c8025 (diff) | |
| download | luajit-ffb124ec77f7881de374c3f4dca8c418a89c6cbc.tar.gz luajit-ffb124ec77f7881de374c3f4dca8c418a89c6cbc.tar.bz2 luajit-ffb124ec77f7881de374c3f4dca8c418a89c6cbc.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_arch.h')
| -rw-r--r-- | src/lj_arch.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lj_arch.h b/src/lj_arch.h index b72dbcca..c66a11c8 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
| @@ -498,6 +498,9 @@ | |||
| 498 | #if defined(__symbian__) || LJ_TARGET_WINDOWS | 498 | #if defined(__symbian__) || LJ_TARGET_WINDOWS |
| 499 | #define LUAJIT_NO_EXP2 | 499 | #define LUAJIT_NO_EXP2 |
| 500 | #endif | 500 | #endif |
| 501 | #if LJ_TARGET_CONSOLE || (LJ_TARGET_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_8_0) | ||
| 502 | #define LJ_NO_SYSTEM 1 | ||
| 503 | #endif | ||
| 501 | 504 | ||
| 502 | #if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4 | 505 | #if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4 |
| 503 | #define LJ_NO_UNWIND 1 | 506 | #define LJ_NO_UNWIND 1 |