diff options
author | Mike Pall <mike> | 2014-03-24 09:42:05 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2014-03-24 09:42:05 +0100 |
commit | ce477ffbfa15a50f7c3a0dd3fc071f06b6fe8d11 (patch) | |
tree | 8e5b2417c02886b84ab450a55a3cb256b32a0d91 | |
parent | 14e0f5ad8baf627f23fb15856710b206c7e3fa7f (diff) | |
parent | 1ca794e0b071416afdf3f351e0a953029f59eff7 (diff) | |
download | luajit-ce477ffbfa15a50f7c3a0dd3fc071f06b6fe8d11.tar.gz luajit-ce477ffbfa15a50f7c3a0dd3fc071f06b6fe8d11.tar.bz2 luajit-ce477ffbfa15a50f7c3a0dd3fc071f06b6fe8d11.zip |
Merge branch 'master' into v2.1
-rw-r--r-- | src/luajit.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/luajit.c b/src/luajit.c index dd71af82..e292da80 100644 --- a/src/luajit.c +++ b/src/luajit.c | |||
@@ -300,17 +300,17 @@ static int loadjitmodule(lua_State *L) | |||
300 | lua_concat(L, 2); | 300 | lua_concat(L, 2); |
301 | if (lua_pcall(L, 1, 1, 0)) { | 301 | if (lua_pcall(L, 1, 1, 0)) { |
302 | const char *msg = lua_tostring(L, -1); | 302 | const char *msg = lua_tostring(L, -1); |
303 | if (msg && !strncmp(msg, "module ", 7)) { | 303 | if (msg && !strncmp(msg, "module ", 7)) |
304 | err: | 304 | goto nomodule; |
305 | l_message(progname, | 305 | return report(L, 1); |
306 | "unknown luaJIT command or jit.* modules not installed"); | ||
307 | return 1; | ||
308 | } else { | ||
309 | return report(L, 1); | ||
310 | } | ||
311 | } | 306 | } |
312 | lua_getfield(L, -1, "start"); | 307 | lua_getfield(L, -1, "start"); |
313 | if (lua_isnil(L, -1)) goto err; | 308 | if (lua_isnil(L, -1)) { |
309 | nomodule: | ||
310 | l_message(progname, | ||
311 | "unknown luaJIT command or jit.* modules not installed"); | ||
312 | return 1; | ||
313 | } | ||
314 | lua_remove(L, -2); /* Drop module table. */ | 314 | lua_remove(L, -2); /* Drop module table. */ |
315 | return 0; | 315 | return 0; |
316 | } | 316 | } |