diff options
author | Mike Pall <mike> | 2015-10-24 19:02:15 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2015-10-24 19:02:15 +0200 |
commit | 3639ff41420610969f44eceebac11253ff7c8025 (patch) | |
tree | ac661b36f4e6444c7bce5c5eff492b3482859d48 /src | |
parent | 7579b161af49b379f3ac071d309bcde69aba7810 (diff) | |
download | luajit-3639ff41420610969f44eceebac11253ff7c8025.tar.gz luajit-3639ff41420610969f44eceebac11253ff7c8025.tar.bz2 luajit-3639ff41420610969f44eceebac11253ff7c8025.zip |
iOS: Disable os.execute() when building for iOS >= 8.0.
Thanks to Vyacheslav Egorov.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib_os.c | 2 | ||||
-rw-r--r-- | src/lj_arch.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib_os.c b/src/lib_os.c index bb5a141e..762bb591 100644 --- a/src/lib_os.c +++ b/src/lib_os.c | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | LJLIB_CF(os_execute) | 37 | LJLIB_CF(os_execute) |
38 | { | 38 | { |
39 | #if LJ_TARGET_CONSOLE | 39 | #if LJ_NO_SYSTEM |
40 | #if LJ_52 | 40 | #if LJ_52 |
41 | errno = ENOSYS; | 41 | errno = ENOSYS; |
42 | return luaL_fileresult(L, 0, NULL); | 42 | return luaL_fileresult(L, 0, NULL); |
diff --git a/src/lj_arch.h b/src/lj_arch.h index 9a6d4305..f1a1160f 100644 --- a/src/lj_arch.h +++ b/src/lj_arch.h | |||
@@ -426,6 +426,9 @@ | |||
426 | #if defined(__symbian__) | 426 | #if defined(__symbian__) |
427 | #define LUAJIT_NO_EXP2 | 427 | #define LUAJIT_NO_EXP2 |
428 | #endif | 428 | #endif |
429 | #if LJ_TARGET_CONSOLE || (LJ_TARGET_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_8_0) | ||
430 | #define LJ_NO_SYSTEM 1 | ||
431 | #endif | ||
429 | 432 | ||
430 | #if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4 | 433 | #if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4 |
431 | #define LJ_NO_UNWIND 1 | 434 | #define LJ_NO_UNWIND 1 |