summaryrefslogtreecommitdiff
path: root/libguile/environments.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-09-10 22:27:30 +0200
committerLudovic Courtès <ludo@gnu.org>2008-09-10 22:27:30 +0200
commit35a9197ccc91a3663313e1bf7d369101754a1075 (patch)
tree0389f04f4267d26b70c8e8cd54329be28ccf438b /libguile/environments.c
parente7bca22779c68b800c75fdad8841440dfeb32f8d (diff)
parentf30e1bdf97ae8b2b2918da585f887a4d3a23a347 (diff)
downloadguile-35a9197ccc91a3663313e1bf7d369101754a1075.tar.gz
Merge commit 'f30e1bdf97ae8b2b2918da585f887a4d3a23a347' into boehm-demers-weiser-gc
Conflicts: libguile/Makefile.am libguile/coop-pthreads.c libguile/gc-freelist.c libguile/gc-segment.c libguile/gc.c libguile/private-gc.h test-suite/tests/environments.nottest
Diffstat (limited to 'libguile/environments.c')
-rw-r--r--libguile/environments.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/environments.c b/libguile/environments.c
index 34788cc74..ed23d3011 100644
--- a/libguile/environments.c
+++ b/libguile/environments.c
@@ -667,9 +667,10 @@ core_environments_unobserve (SCM env, SCM observer)
if (scm_is_eq (first, observer))
{
/* Remove the first observer */
- handling_weaks
- ? SCM_SET_CORE_ENVIRONMENT_WEAK_OBSERVERS (env, rest)
- : SCM_SET_CORE_ENVIRONMENT_OBSERVERS (env, rest);
+ if (handling_weaks)
+ SCM_SET_CORE_ENVIRONMENT_WEAK_OBSERVERS (env, rest);
+ else
+ SCM_SET_CORE_ENVIRONMENT_OBSERVERS (env, rest);
return;
}