(SCM_CELL_OBJECT_LOC): use SCM_GC_CELL_OBJECT to prevent

compound expression as lvalue errors.

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index e5211a0..172e1f6 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-26  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * gc.h (SCM_CELL_OBJECT_LOC): use SCM_GC_CELL_OBJECT to prevent
+       compound expression as lvalue errors.
+
 2004-05-24  Marius Vollmer  <mvo@zagadka.de>
 
        * dynwind.c (winder_mark): Use SCM_PACK to correctly convert the

diff --git a/libguile/gc.h b/libguile/gc.h
index 34a7e7b..0dc40f6 100644 (file)
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -214,7 +214,7 @@ typedef unsigned long scm_t_c_bvec_long;
   (SCM_GC_SET_CELL_OBJECT ((x), 1, (v)))
 
 
-#define SCM_CELL_OBJECT_LOC(x, n) (&SCM_CELL_OBJECT ((x), (n)))
+#define SCM_CELL_OBJECT_LOC(x, n) (SCM_VALIDATE_CELL((x), &SCM_GC_CELL_OBJECT ((x), (n))))
 #define SCM_CARLOC(x)             (SCM_CELL_OBJECT_LOC ((x), 0))
 #define SCM_CDRLOC(x)             (SCM_CELL_OBJECT_LOC ((x), 1))