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_io.c
+++ b/src/lib_io.c
@@ -421,7 +421,7 @@ LJLIB_CF(io_popen)
 LJLIB_CF(io_tmpfile)
 {
  IOFileUD *iof = io_file_new(L);
-#if LJ_TARGET_PS3
+#if LJ_TARGET_PS3 || LJ_TARGET_PS4
  iof->fp = NULL; errno = ENOSYS;
 #else
  iof->fp = tmpfile();