summaryrefslogtreecommitdiff
path: root/libguile/modules.c
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/modules.c')
-rw-r--r--libguile/modules.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/modules.c b/libguile/modules.c
index e06082186..ca8875dab 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -304,8 +304,8 @@ resolve_duplicate_binding (SCM module, SCM sym,
val1 = SCM_VARIABLE_REF (var1);
val2 = SCM_VARIABLE_REF (var2);
- val1 = (val1 == SCM_UNSPECIFIED) ? SCM_BOOL_F : val1;
- val2 = (val2 == SCM_UNSPECIFIED) ? SCM_BOOL_F : val2;
+ val1 = scm_is_eq (val1, SCM_UNSPECIFIED) ? SCM_BOOL_F : val1;
+ val2 = scm_is_eq (val2, SCM_UNSPECIFIED) ? SCM_BOOL_F : val2;
handlers = SCM_MODULE_DUPLICATE_HANDLERS (module);
if (scm_is_false (handlers))
@@ -947,14 +947,14 @@ SCM_DEFINE (scm_module_reverse_lookup, "module-reverse-lookup", 2, 0, 0,
{
handle = SCM_CAR (ls);
- if (SCM_CAR (handle) == SCM_PACK (NULL))
+ if (SCM_UNPACK (SCM_CAR (handle)) == 0)
{
/* FIXME: We hit a weak pair whose car has become unreachable.
We should remove the pair in question or something. */
}
else
{
- if (SCM_CDR (handle) == variable)
+ if (scm_is_eq (SCM_CDR (handle), variable))
return SCM_CAR (handle);
}