* unif.h (SCM_ARRAY_CONTIGUOUS): Reintroduced as deprecated.

* RELEASE: Added deprecated macro SCM_ARRAY_CONTIGUOUS

diff --git a/ChangeLog b/ChangeLog
index 87d18fe..5e23974 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-19  Mikael Djurfeldt  <mdj@linnaeus.mit.edu>
+
+       * RELEASE: Added deprecated macro SCM_ARRAY_CONTIGUOUS
+
 2001-04-17  Gary Houston  <ghouston@arglist.com>
 
        * configure.in: run the autoconf BIGENDIAN check.

diff --git a/RELEASE b/RELEASE
index 16c7726..d49ea09 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -69,7 +69,8 @@ In release 1.6:
   SCM_SUBR_DOC, SCM_OPDIRP, SCM_VALIDATE_OPDIR, SCM_WTA, RETURN_SCM_WTA,
   SCM_WNA, SCM_FUNC_NAME, SCM_VALIDATE_NUMBER_COPY,
   SCM_VALIDATE_NUMBER_DEF_COPY, SCM_SLOPPY_CONSP, SCM_SLOPPY_NCONSP,
-  SCM_SETAND_CDR, SCM_SETOR_CDR, SCM_SETAND_CAR, SCM_SETOR_CAR
+  SCM_SETAND_CDR, SCM_SETOR_CDR, SCM_SETAND_CAR, SCM_SETOR_CAR,
+  SCM_ARRAY_CONTIGUOUS
 - remove scm_vector_set_length_x
 - remove function scm_call_catching_errors
   (replaced by catch functions from throw.[ch])

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 62a0ad9..9969207 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,7 @@
 2001-04-19  Mikael Djurfeldt  <mdj@linnaeus.mit.edu>
 
+       * unif.h (SCM_ARRAY_CONTIGUOUS): Reintroduced as deprecated.
+
        * __scm.h (SCM_WTA_DISPATCH_0, SCM_WTA_DISPATCH_1,
        SCM_WTA_DISPATCH_2, SCM_WTA_DISPATCH_n): Inserted required
        parentheses in order to get the correct associativity.

diff --git a/libguile/unif.h b/libguile/unif.h
index bddffa1..6cd376e 100644 (file)
--- a/libguile/unif.h
+++ b/libguile/unif.h
@@ -78,6 +78,10 @@ extern scm_bits_t scm_tc16_array;
 
 #define SCM_ARRAY_FLAG_CONTIGUOUS (1 << 16)
 
+#if (SCM_DEBUG_DEPRECATED == 0)
+#define SCM_ARRAY_CONTIGUOUS SCM_ARRAY_FLAG_CONTIGUOUS
+#endif
+
 #define SCM_ARRAYP(a)      SCM_TYP16_PREDICATE (scm_tc16_array, a)
 #define SCM_ARRAY_NDIM(x)   ((scm_sizet) (SCM_CELL_WORD_0 (x) >> 17))
 #define SCM_ARRAY_CONTP(x)  (SCM_CELL_WORD_0 (x) & SCM_ARRAY_FLAG_CONTIGUOUS)