Merge branch 'master' into v2.1

2014-02-26 15:57:13 +01:00
parent 2863b10956 6a47e123a4
commit 9695c5ab46
7 changed files with 138 additions and 10 deletions
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -73,7 +73,7 @@ LJLIB_CF(os_rename)

 LJLIB_CF(os_tmpname)
 {
-#if LJ_TARGET_PS3
+#if LJ_TARGET_PS3 || LJ_TARGET_PS4
  lj_err_caller(L, LJ_ERR_OSUNIQF);
  return 0;
 #else