mirror of
https://github.com/CPunch/Cosmo.git
synced 2024-11-21 15:00:06 +00:00
fix vm.collect()
we don't freeze the vm on entry to C functions now
This commit is contained in:
parent
c0893b8a14
commit
bfdd33e01d
@ -878,9 +878,14 @@ int cosmoB_vnewindexBProto(CState *state, int nargs, CValue *args)
|
||||
// vm.collect()
|
||||
int cosmoB_vcollect(CState *state, int nargs, CValue *args)
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
// now force a garbage collection
|
||||
cosmoM_collectGarbage(state);
|
||||
|
||||
=======
|
||||
// force a garbage collection
|
||||
cosmoM_collectGarbage(state);
|
||||
>>>>>>> 409937c (fix vm.collect())
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user