Merge branch 'master' into v2.1

2015-10-24 19:03:14 +02:00
parent 6a5441114e 3639ff4142
commit ffb124ec77
2 changed files with 4 additions and 1 deletions
--- a/src/lib_os.c
+++ b/src/lib_os.c
@@ -39,7 +39,7 @@

 LJLIB_CF(os_execute)
 {
-#if LJ_TARGET_CONSOLE
+#if LJ_NO_SYSTEM
 #if LJ_52
  errno = ENOSYS;
  return luaL_fileresult(L, 0, NULL);