summaryrefslogtreecommitdiff
path: root/libguile/objects.c
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/objects.c')
-rw-r--r--libguile/objects.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/objects.c b/libguile/objects.c
index 16a8c0b8c..2d52b0b93 100644
--- a/libguile/objects.c
+++ b/libguile/objects.c
@@ -157,10 +157,10 @@ scm_class_of (SCM x)
case scm_tc7_smob:
{
- SCM type = SCM_TYP16 (x);
+ long type = SCM_TYP16 (x);
if (type == scm_tc16_flo)
{
- if (SCM_CAR (x) & SCM_IMAG_PART)
+ if (SCM_CARW (x) & SCM_IMAG_PART)
return scm_class_complex;
else
return scm_class_real;
@@ -171,8 +171,8 @@ scm_class_of (SCM x)
/* fall through to ports */
}
case scm_tc7_port:
- return scm_port_class[(SCM_WRTNG & SCM_CAR (x)
- ? (SCM_RDNG & SCM_CAR (x)
+ return scm_port_class[(SCM_WRTNG & SCM_CARW (x)
+ ? (SCM_RDNG & SCM_CARW (x)
? SCM_INOUT_PCLASS_INDEX | SCM_PTOBNUM (x)
: SCM_OUT_PCLASS_INDEX | SCM_PTOBNUM (x))
: SCM_IN_PCLASS_INDEX | SCM_PTOBNUM (x))];
@@ -280,7 +280,7 @@ scm_mcache_lookup_cmethod (SCM cache, SCM args)
if (SCM_NIMP (ls))
do
{
- i += (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls)))
+ i += SCM_ASWORD (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls)))
[scm_si_hashsets + hashset]);
ls = SCM_CDR (ls);
}