diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 7df13061e..11b27384f 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,10 @@ +2003-11-30 Dirk Herrmann + + * modules.c (module_variable): Fixed (and thus simplified) the + definition of SCM_BOUND_THING_P to reflect the fact that since + after the 1.4 series of guile, obarrays only hold variable + objects. + 2003-11-30 Marius Vollmer * numbers.c (scm_logand): It's "#b...", not "#\b...". diff --git a/libguile/modules.c b/libguile/modules.c index f034426ab..7d578dcd6 100644 --- a/libguile/modules.c +++ b/libguile/modules.c @@ -277,8 +277,7 @@ static SCM module_variable (SCM module, SCM sym) { #define SCM_BOUND_THING_P(b) \ - (!SCM_FALSEP(b) && \ - (!SCM_VARIABLEP(b) || !SCM_UNBNDP (SCM_VARIABLE_REF (b)))) + (SCM_VARIABLEP (b) && !SCM_UNBNDP (SCM_VARIABLE_REF (b))) /* 1. Check module obarray */ SCM b = scm_hashq_ref (SCM_MODULE_OBARRAY (module), sym, SCM_UNDEFINED);