summaryrefslogtreecommitdiff
path: root/libguile/unif.h
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/unif.h')
-rw-r--r--libguile/unif.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/libguile/unif.h b/libguile/unif.h
index 131aa12b1..4f0d4e484 100644
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -58,28 +58,28 @@
bit 15 is the SCM_ARRAY_FLAG_CONTIGUOUS flag
bits 16-31 hold the smob type id: scm_tc16_array
CDR: pointer to a malloced block containing an scm_array structure
- followed by an scm_array_dim_t structure for each dimension.
+ followed by an scm_t_array_dim structure for each dimension.
*/
-typedef struct scm_array_t
+typedef struct scm_t_array
{
SCM v; /* the contents of the array, e.g., a vector or uniform vector. */
unsigned long base;
-} scm_array_t;
+} scm_t_array;
-typedef struct scm_array_dim_t
+typedef struct scm_t_array_dim
{
long lbnd;
long ubnd;
long inc;
-} scm_array_dim_t;
+} scm_t_array_dim;
#if (SCM_DEBUG_DEPRECATED == 0)
-# define scm_array scm_array_t
-# define scm_array_dim scm_array_dim_t
+# define scm_array scm_t_array
+# define scm_array_dim scm_t_array_dim
#endif
-extern scm_bits_t scm_tc16_array;
+extern scm_t_bits scm_tc16_array;
#define SCM_ARRAY_FLAG_CONTIGUOUS (1 << 16)
@@ -95,10 +95,10 @@ extern scm_bits_t scm_tc16_array;
#define SCM_CLR_ARRAY_CONTIGUOUS_FLAG(x) \
(SCM_SET_CELL_WORD_0 ((x), SCM_CELL_WORD_0 (x) & ~SCM_ARRAY_FLAG_CONTIGUOUS))
-#define SCM_ARRAY_MEM(a) ((scm_array_t *) SCM_CELL_WORD_1 (a))
+#define SCM_ARRAY_MEM(a) ((scm_t_array *) SCM_CELL_WORD_1 (a))
#define SCM_ARRAY_V(a) (SCM_ARRAY_MEM (a)->v)
#define SCM_ARRAY_BASE(a) (SCM_ARRAY_MEM (a)->base)
-#define SCM_ARRAY_DIMS(a) ((scm_array_dim_t *)((char *) SCM_ARRAY_MEM (a) + sizeof (scm_array_t)))
+#define SCM_ARRAY_DIMS(a) ((scm_t_array_dim *)((char *) SCM_ARRAY_MEM (a) + sizeof (scm_t_array)))
#define SCM_I_MAX_LENGTH ((unsigned long) (-1L) >> 8)
@@ -148,7 +148,7 @@ extern SCM scm_bit_set_star_x (SCM v, SCM kv, SCM obj);
extern SCM scm_bit_count_star (SCM v, SCM kv, SCM obj);
extern SCM scm_bit_invert_x (SCM v);
extern SCM scm_istr2bve (char *str, long len);
-extern SCM scm_array_to_list (SCM v);
+extern SCM scm_t_arrayo_list (SCM v);
extern SCM scm_list_to_uniform_array (SCM ndim, SCM prot, SCM lst);
extern int scm_raprin1 (SCM exp, SCM port, scm_print_state *pstate);
extern SCM scm_array_prototype (SCM ra);