summaryrefslogtreecommitdiff
path: root/libguile/arrays.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-12-08 21:21:37 +0100
committerAndy Wingo <wingo@pobox.com>2009-12-08 23:13:07 +0100
commitc395cb78134188b1e8c19d4c36045fcd5a411373 (patch)
tree6cf050aac9f3b29cab08e2ac6b6593146af8c085 /libguile/arrays.h
parent56164dc47f6616b359f0ad23be208f01a77b55fa (diff)
downloadguile-c395cb78134188b1e8c19d4c36045fcd5a411373.tar.gz
fix erroneous SCM_CELL_* usage in arrays.[ch]
* libguile/arrays.h (SCM_I_ARRAY_FLAG_CONTIGUOUS, SCM_I_ARRAY_NDIM): (SCM_I_ARRAY_CONTP, SCM_I_ARRAY_MEM): * libguile/arrays.c (SCM_SET_ARRAY_CONTIGUOUS_FLAG): (SCM_CLR_ARRAY_CONTIGUOUS_FLAG): Fix macros to use SCM_SMOB macros instead of SCM_CELL macros.
Diffstat (limited to 'libguile/arrays.h')
-rw-r--r--libguile/arrays.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/arrays.h b/libguile/arrays.h
index 35e5471bf..325bb9cda 100644
--- a/libguile/arrays.h
+++ b/libguile/arrays.h
@@ -65,13 +65,13 @@ typedef struct scm_i_t_array
SCM_API scm_t_bits scm_i_tc16_array;
-#define SCM_I_ARRAY_FLAG_CONTIGUOUS (1 << 16)
+#define SCM_I_ARRAY_FLAG_CONTIGUOUS (1 << 0)
#define SCM_I_ARRAYP(a) SCM_TYP16_PREDICATE (scm_i_tc16_array, a)
-#define SCM_I_ARRAY_NDIM(x) ((size_t) (SCM_CELL_WORD_0 (x) >> 17))
-#define SCM_I_ARRAY_CONTP(x) (SCM_CELL_WORD_0(x) & SCM_I_ARRAY_FLAG_CONTIGUOUS)
+#define SCM_I_ARRAY_NDIM(x) ((size_t) (SCM_SMOB_FLAGS (x)>>1))
+#define SCM_I_ARRAY_CONTP(x) (SCM_SMOB_FLAGS(x) & SCM_I_ARRAY_FLAG_CONTIGUOUS)
-#define SCM_I_ARRAY_MEM(a) ((scm_i_t_array *) SCM_CELL_WORD_1 (a))
+#define SCM_I_ARRAY_MEM(a) ((scm_i_t_array *) SCM_SMOB_DATA_1 (a))
#define SCM_I_ARRAY_V(a) (SCM_I_ARRAY_MEM (a)->v)
#define SCM_I_ARRAY_BASE(a) (SCM_I_ARRAY_MEM (a)->base)
#define SCM_I_ARRAY_DIMS(a) \