Merge branch 'master' into v2.1

2014-04-27 00:10:34 +02:00
parent c8d1aff0ba 7a39be0ac4
commit e26dc8a215
8 changed files with 158 additions and 28 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 || LJ_TARGET_PS4
+#if LJ_TARGET_PS3 || LJ_TARGET_PS4 || LJ_TARGET_PSVITA
  iof->fp = NULL; errno = ENOSYS;
 #else
  iof->fp = tmpfile();