aboutsummaryrefslogtreecommitdiff
path: root/src/lib_os.c
diff options
context:
space:
mode:
authorMike Pall <mike>2015-10-24 19:03:14 +0200
committerMike Pall <mike>2015-10-24 19:03:14 +0200
commitffb124ec77f7881de374c3f4dca8c418a89c6cbc (patch)
treeece7b7d3423e79930a8e29c9c8c70e661236dec6 /src/lib_os.c
parent6a5441114e6f38e340a5a38cbef735ab923074b8 (diff)
parent3639ff41420610969f44eceebac11253ff7c8025 (diff)
downloadluajit-ffb124ec77f7881de374c3f4dca8c418a89c6cbc.tar.gz
luajit-ffb124ec77f7881de374c3f4dca8c418a89c6cbc.tar.bz2
luajit-ffb124ec77f7881de374c3f4dca8c418a89c6cbc.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 7b5873a5..37d7d5be 100644
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -39,7 +39,7 @@
39 39
40LJLIB_CF(os_execute) 40LJLIB_CF(os_execute)
41{ 41{
42#if LJ_TARGET_CONSOLE 42#if LJ_NO_SYSTEM
43#if LJ_52 43#if LJ_52
44 errno = ENOSYS; 44 errno = ENOSYS;
45 return luaL_fileresult(L, 0, NULL); 45 return luaL_fileresult(L, 0, NULL);