diff --git a/llimits.h b/llimits.h
index 9fcb5d85..92300896 100644
--- a/llimits.h
+++ b/llimits.h
@@ -1,5 +1,5 @@
 /*
-** $Id: llimits.h,v 1.79 2010/04/29 17:31:31 roberto Exp roberto $
+** $Id: llimits.h,v 1.80 2010/05/07 18:44:12 roberto Exp roberto $
 ** Limits, basic types, and some other `installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
@@ -179,7 +179,8 @@ typedef lu_int32 Instruction;
 #if !defined(HARDMEMTESTS)
 #define condchangemem(L)	condmovestack(L)
 #else
-#define condchangemem(L)	luaC_fullgc(L, 0)
+#define condchangemem(L)  \
+	((void)(gcstopped(G(L)) || (luaC_fullgc(L, 0), 1)))
 #endif
 
 #endif