summaryrefslogtreecommitdiff
path: root/libguile/unif.h
diff options
context:
space:
mode:
authorGreg J. Badros <gjb@cs.washington.edu>2000-03-09 18:58:58 +0000
committerGreg J. Badros <gjb@cs.washington.edu>2000-03-09 18:58:58 +0000
commitc209c88e54d08a557a297836200e16e20355df02 (patch)
treedce0d672bc0a63be5f658c65269c9a4144da1c67 /libguile/unif.h
parentdf8bb2dc3988d24c0f64bd2cc5fa01a31825d11a (diff)
downloadguile-c209c88e54d08a557a297836200e16e20355df02.tar.gz
*.[ch]: make a distinction between SCM as a generic
name for a Scheme object (now a void*), and SCM as 32 bit word for storing tags and immediates (now a long int). Introduced SCM_ASWORD and SCM_ASSCM for conversion. Fixed various dubious code in the process: arbiter.c (use macros), unif.c (scm_array_p),
Diffstat (limited to 'libguile/unif.h')
-rw-r--r--libguile/unif.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/unif.h b/libguile/unif.h
index 6d2cdda2a..c14b7b6b8 100644
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -76,10 +76,10 @@ typedef struct scm_array_dim
extern long scm_tc16_array;
-#define SCM_ARRAYP(a) (SCM_NIMP(a) && (scm_tc16_array==SCM_TYP16(a)))
-#define SCM_ARRAY_NDIM(x) ((scm_sizet)(SCM_CAR(x)>>17))
+#define SCM_ARRAYP(a) (SCM_NIMP(a) && (scm_tc16_array == SCM_TYP16(a)))
+#define SCM_ARRAY_NDIM(x) ((scm_sizet)(SCM_CARW(x)>>17))
#define SCM_ARRAY_CONTIGUOUS 0x10000
-#define SCM_ARRAY_CONTP(x) (SCM_ARRAY_CONTIGUOUS & (int)SCM_CAR(x))
+#define SCM_ARRAY_CONTP(x) (SCM_ARRAY_CONTIGUOUS & (int)(SCM_CARW(x)))
#define SCM_ARRAY_V(a) (((scm_array *)SCM_CDR(a))->v)
#define SCM_ARRAY_BASE(a) (((scm_array *)SCM_CDR(a))->base)