aboutsummaryrefslogtreecommitdiff
path: root/src/lib_os.c
diff options
context:
space:
mode:
authorMike Pall <mike>2014-02-26 15:57:13 +0100
committerMike Pall <mike>2014-02-26 15:57:13 +0100
commit9695c5ab46b4621a453839b196bd07421f5300da (patch)
tree607900a3dabba6ad88f80f2eb627f5f903282482 /src/lib_os.c
parent2863b1095699404693a50082dd8d19b6c4cad99f (diff)
parent6a47e123a4339e33a7942525a19348cd2068b057 (diff)
downloadluajit-9695c5ab46b4621a453839b196bd07421f5300da.tar.gz
luajit-9695c5ab46b4621a453839b196bd07421f5300da.tar.bz2
luajit-9695c5ab46b4621a453839b196bd07421f5300da.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lib_os.c')
-rw-r--r--src/lib_os.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib_os.c b/src/lib_os.c
index 653f3908..76ffcaa8 100644
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -73,7 +73,7 @@ LJLIB_CF(os_rename)
73 73
74LJLIB_CF(os_tmpname) 74LJLIB_CF(os_tmpname)
75{ 75{
76#if LJ_TARGET_PS3 76#if LJ_TARGET_PS3 || LJ_TARGET_PS4
77 lj_err_caller(L, LJ_ERR_OSUNIQF); 77 lj_err_caller(L, LJ_ERR_OSUNIQF);
78 return 0; 78 return 0;
79#else 79#else