Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2015-06-09 22:09:11 +02:00
7 changed files with 61 additions and 8 deletions

View File

@@ -489,7 +489,7 @@
#define LUAJIT_NO_EXP2
#endif
#if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3
#if defined(LUAJIT_NO_UNWIND) || defined(__symbian__) || LJ_TARGET_IOS || LJ_TARGET_PS3 || LJ_TARGET_PS4
#define LJ_NO_UNWIND 1
#endif