aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-05-24 16:29:46 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2010-05-24 16:29:46 -0300
commitddf1f2a0530dc299fe4997c51b86db9710a94408 (patch)
tree688d84b0bcf939acdf1df9ee1fffeba7581d4e16
parente34d3c06b069e36189c334d8bfbcf5c978e994c5 (diff)
downloadlua-ddf1f2a0530dc299fe4997c51b86db9710a94408.tar.gz
lua-ddf1f2a0530dc299fe4997c51b86db9710a94408.tar.bz2
lua-ddf1f2a0530dc299fe4997c51b86db9710a94408.zip
GC should not run when stopped, even in hard tests
-rw-r--r--llimits.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/llimits.h b/llimits.h
index 9fcb5d85..92300896 100644
--- a/llimits.h
+++ b/llimits.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: llimits.h,v 1.79 2010/04/29 17:31:31 roberto Exp roberto $ 2** $Id: llimits.h,v 1.80 2010/05/07 18:44:12 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*/
@@ -179,7 +179,8 @@ typedef lu_int32 Instruction;
179#if !defined(HARDMEMTESTS) 179#if !defined(HARDMEMTESTS)
180#define condchangemem(L) condmovestack(L) 180#define condchangemem(L) condmovestack(L)
181#else 181#else
182#define condchangemem(L) luaC_fullgc(L, 0) 182#define condchangemem(L) \
183 ((void)(gcstopped(G(L)) || (luaC_fullgc(L, 0), 1)))
183#endif 184#endif
184 185
185#endif 186#endif