* Fix SCM <--> scm_t_bits related typing problems.

[bpt/guile.git] / libguile / weaks.c

diff --git a/libguile/weaks.c b/libguile/weaks.c
index 144f32c..6180f1b 100644 (file)
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@@ -70,7 +70,7 @@ SCM_DEFINE (scm_make_weak_vector, "make-weak-vector", 1, 1, 0,
   SCM_SET_VECTOR_LENGTH (v, SCM_INUM (size), scm_tc7_wvect);
   SCM_SETVELTS(v, SCM_VELTS(v) + 2);
   SCM_VELTS(v)[-2] = SCM_EOL;
-  SCM_UNPACK (SCM_VELTS (v)[-1]) = 0;
+  SCM_VECTOR_BASE (v) [-1] = 0;
   SCM_ALLOW_INTS;
   return v;
 }
@@ -142,7 +142,7 @@ SCM_DEFINE (scm_make_weak_key_hash_table, "make-weak-key-hash-table", 1, 0, 0,
   SCM_VALIDATE_INUM (1, size);
   v = scm_make_weak_vector (size, SCM_EOL);
   SCM_DEFER_INTS;
-  SCM_UNPACK (SCM_VELTS (v)[-1]) = 1;
+  SCM_VECTOR_BASE (v) [-1] = 1;
   SCM_ALLOW_INTS;
   return v;
 }
@@ -159,7 +159,7 @@ SCM_DEFINE (scm_make_weak_value_hash_table, "make-weak-value-hash-table", 1, 0,
   SCM_VALIDATE_INUM (1, size);
   v = scm_make_weak_vector (size, SCM_EOL);
   SCM_DEFER_INTS;
-  SCM_UNPACK (SCM_VELTS (v)[-1]) = 2;
+  SCM_VECTOR_BASE (v) [-1] = 2;
   SCM_ALLOW_INTS;
   return v;
 }
@@ -177,7 +177,7 @@ SCM_DEFINE (scm_make_doubly_weak_hash_table, "make-doubly-weak-hash-table", 1, 0
   SCM_VALIDATE_INUM (1, size);
   v = scm_make_weak_vector (size, SCM_EOL);
   SCM_DEFER_INTS;
-  SCM_UNPACK (SCM_VELTS (v)[-1]) = 3;
+  SCM_VECTOR_BASE (v) [-1] = 3;
   SCM_ALLOW_INTS;
   return v;
 }