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_api.c
+++ b/src/lj_api.c
@@ -1153,7 +1153,7 @@ LUA_API int lua_gc(lua_State *L, int what, int data)
    MSize a = (MSize)data << 10;
    g->gc.threshold = (a <= g->gc.total) ? (g->gc.total - a) : 0;
    while (g->gc.total >= g->gc.threshold)
-      if (lj_gc_step(L)) {
+      if (lj_gc_step(L) > 0) {
 	res = 1;
 	break;
      }