aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2011-02-01 14:52:38 -0200
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2011-02-01 14:52:38 -0200
commitf6bd8b1147d58c35e73225b4adc5499c11d2bf0f (patch)
tree7f02f0bd1ffbab1881dc331fab47cb3efe99f57d
parenta7faa557fab4134966b1bdc0e1169a24c0f8cab3 (diff)
downloadlua-f6bd8b1147d58c35e73225b4adc5499c11d2bf0f.tar.gz
lua-f6bd8b1147d58c35e73225b4adc5499c11d2bf0f.tar.bz2
lua-f6bd8b1147d58c35e73225b4adc5499c11d2bf0f.zip
better control for GC running or stopped
-rw-r--r--llimits.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/llimits.h b/llimits.h
index 2c69ce53..02b10fe4 100644
--- a/llimits.h
+++ b/llimits.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: llimits.h,v 1.85 2010/12/10 13:40:22 roberto Exp roberto $ 2** $Id: llimits.h,v 1.86 2010/12/23 15:38:28 roberto Exp roberto $
3** Limits, basic types, and some other `installation-dependent' definitions 3** Limits, basic types, and some other `installation-dependent' definitions
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -277,7 +277,7 @@ union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
277#define condchangemem(L) condmovestack(L) 277#define condchangemem(L) condmovestack(L)
278#else 278#else
279#define condchangemem(L) \ 279#define condchangemem(L) \
280 ((void)(gcstopped(G(L)) || (luaC_fullgc(L, 0), 1))) 280 ((void)(!(G(L)->gcrunning) || (luaC_fullgc(L, 0), 1)))
281#endif 281#endif
282 282
283#endif 283#endif