Merge branch 'master' into v2.1

2015-10-24 19:03:14 +02:00
parent 6a5441114e 3639ff4142
commit ffb124ec77
2 changed files with 4 additions and 1 deletions
--- a/src/lj_arch.h
+++ b/src/lj_arch.h
@@ -498,6 +498,9 @@
 #if defined(__symbian__) || LJ_TARGET_WINDOWS
 #define LUAJIT_NO_EXP2
 #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
 #define LJ_NO_UNWIND		1