Merge branch 'master' into v2.1

2013-11-05 19:46:41 +01:00
parent 5c55b766bd 8941b1994e
commit 8a2b2beac2
2 changed files with 2 additions and 2 deletions
--- a/src/lj_gc.c
+++ b/src/lj_gc.c
@@ -685,7 +685,7 @@ int LJ_FASTCALL lj_gc_step(lua_State *L)
  if (g->gc.debt < GCSTEPSIZE) {
    g->gc.threshold = g->gc.total + GCSTEPSIZE;
    g->vmstate = ostate;
-    return 1;
+    return -1;
  } else {
    g->gc.debt -= GCSTEPSIZE;
    g->gc.threshold = g->gc.total;