guile/guile-core/libguile ChangeLog unif.c unif.h

[Martin Grabmueller]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Martin Grabmueller <address@hidden>     01/05/23 23:53:26

Modified files:
        guile-core/libguile: ChangeLog unif.c unif.h 

Log message:
        * unif.c (scm_make_ra, array_free), unif.h (SCM_ARRAY_DIMS):
        Changed use of scm_array->scm_array_t and
        scm_array_dim->scm_array_dim_t to enable build with
        --disable-deprecated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/ChangeLog.diff?cvsroot=OldCVS&tr1=1.1407&tr2=1.1408&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/unif.c.diff?cvsroot=OldCVS&tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/unif.h.diff?cvsroot=OldCVS&tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1407 
guile/guile-core/libguile/ChangeLog:1.1408
--- guile/guile-core/libguile/ChangeLog:1.1407  Wed May 23 17:50:42 2001
+++ guile/guile-core/libguile/ChangeLog Wed May 23 23:53:26 2001
@@ -1,3 +1,10 @@
+2001-05-24  Martin Grabmueller  <address@hidden>
+
+       * unif.c (scm_make_ra, array_free), unif.h (SCM_ARRAY_DIMS):
+       Changed use of scm_array->scm_array_t and
+       scm_array_dim->scm_array_dim_t to enable build with
+       --disable-deprecated.
+
 2001-05-24  Michael Livshin  <address@hidden>
 
        The purpose of this set of changes is to regularize Guile's usage
Index: guile/guile-core/libguile/unif.c
diff -u guile/guile-core/libguile/unif.c:1.111 
guile/guile-core/libguile/unif.c:1.112
--- guile/guile-core/libguile/unif.c:1.111      Wed May 23 17:50:50 2001
+++ guile/guile-core/libguile/unif.c    Wed May 23 23:53:26 2001
@@ -546,7 +546,8 @@
   SCM_NEWCELL (ra);
   SCM_DEFER_INTS;
   SCM_NEWSMOB(ra, ((scm_bits_t) ndim << 17) + scm_tc16_array,
-              scm_must_malloc ((sizeof (scm_array) + ndim * sizeof 
(scm_array_dim)),
+              scm_must_malloc ((sizeof (scm_array_t) +
+                               ndim * sizeof (scm_array_dim_t)),
                               "array"));
   SCM_ARRAY_V (ra) = scm_nullvect;
   SCM_ALLOW_INTS;
@@ -2635,7 +2636,8 @@
 array_free (SCM ptr)
 {
   scm_must_free (SCM_ARRAY_MEM (ptr));
-  return sizeof (scm_array) + SCM_ARRAY_NDIM (ptr) * sizeof (scm_array_dim);
+  return sizeof (scm_array_t) +
+    SCM_ARRAY_NDIM (ptr) * sizeof (scm_array_dim_t);
 }
 
 void
Index: guile/guile-core/libguile/unif.h
diff -u guile/guile-core/libguile/unif.h:1.36 
guile/guile-core/libguile/unif.h:1.37
--- guile/guile-core/libguile/unif.h:1.36       Wed May 23 17:50:51 2001
+++ guile/guile-core/libguile/unif.h    Wed May 23 23:53:26 2001
@@ -98,7 +98,7 @@
 #define SCM_ARRAY_MEM(a)  ((scm_array_t *) 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))) 
+#define SCM_ARRAY_DIMS(a) ((scm_array_dim_t *)((char *) SCM_ARRAY_MEM (a) + 
sizeof (scm_array_t))) 
 
 #define SCM_I_MAX_LENGTH  ((scm_ubits_t)((scm_bits_t)-1) >> 8)