aboutsummaryrefslogtreecommitdiff
path: root/lapi.c
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2012-05-22 14:50:39 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2012-05-22 14:50:39 -0300
commit086da10dacc9e2b8f7731609f0deec731c854627 (patch)
treed658d3bec0712aee85bb4de1f3324f76595cd3b9 /lapi.c
parentb36b4b521f53e5ff2e18fff3c194d28f9a840868 (diff)
downloadlua-086da10dacc9e2b8f7731609f0deec731c854627.tar.gz
lua-086da10dacc9e2b8f7731609f0deec731c854627.tar.bz2
lua-086da10dacc9e2b8f7731609f0deec731c854627.zip
merge of fields 'lastmajormem' (used in gen. mode) and 'estimate'
(used in inc. mode)
Diffstat (limited to 'lapi.c')
-rw-r--r--lapi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lapi.c b/lapi.c
index be4449f8..547eeefd 100644
--- a/lapi.c
+++ b/lapi.c
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lapi.c,v 2.160 2012/05/11 19:22:33 roberto Exp roberto $ 2** $Id: lapi.c,v 2.161 2012/05/21 13:18:10 roberto Exp roberto $
3** Lua API 3** Lua API
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -1045,7 +1045,7 @@ LUA_API int lua_gc (lua_State *L, int what, int data) {
1045 } 1045 }
1046 case LUA_GCSTEP: { 1046 case LUA_GCSTEP: {
1047 if (g->gckind == KGC_GEN) { /* generational mode? */ 1047 if (g->gckind == KGC_GEN) { /* generational mode? */
1048 res = (g->lastmajormem == 0); /* 1 if will do major collection */ 1048 res = (g->GCestimate == 0); /* true if it will do major collection */
1049 luaC_forcestep(L); /* do a single step */ 1049 luaC_forcestep(L); /* do a single step */
1050 } 1050 }
1051 else { 1051 else {