gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2015-10-24 19:03:14 +02:00
commit ffb124ec77
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib_os.c
View File

@ -39,7 +39,7 @@
LJLIB_CF(os_execute) LJLIB_CF(os_execute)
{ {
#if LJ_TARGET_CONSOLE #if LJ_NO_SYSTEM
#if LJ_52 #if LJ_52
errno = ENOSYS; errno = ENOSYS;
return luaL_fileresult(L, 0, NULL); return luaL_fileresult(L, 0, NULL);

3
src/lj_arch.h
View File

@ -498,6 +498,9 @@
#if defined(__symbian__) || LJ_TARGET_WINDOWS #if defined(__symbian__) || LJ_TARGET_WINDOWS
#define LUAJIT_NO_EXP2 #define LUAJIT_NO_EXP2
#endif #endif
#if LJ_TARGET_CONSOLE || (LJ_TARGET_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_8_0)
#define LJ_NO_SYSTEM 1
#endif
#if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4 #if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4
#define LJ_NO_UNWIND 1 #define LJ_NO_UNWIND 1