remove guile 1.3 compatibility, add 1.4

compatibility functions.

diff --git a/ChangeLog b/ChangeLog
index 9145629cf085c9e6dce7ab8bd63a52a57d96acd4..518fdcf08eeb42a04c8be706160c45b43280e37e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-05  Han-Wen  <hanwen@cs.uu.nl>
+
+       * lily-guile.hh: remove guile 1.3 compatibility,  add 1.4
+       compatibility functions.
+
 2002-07-05  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Documentation/windows/lilypond.hint (requires): Add libintl2.

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 4930b4fec728e67a866f8e30018fff1bd13951a2..8d40aa4f5515f3cea29530567b6eefb7b1f6ce57 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -37,25 +37,6 @@
 
 #include "drul-array.hh"
 
-
-/* Guile 1.3.4 compatibility */
-#if GUILE_MINOR_VERSION < 4
-
-
-#ifndef SCM_CELL_TYPE
-#define SCM_CELL_TYPE(X) SCM_CAR (X)
-#endif
-
-#ifndef SCM_CELL_WORD_1
-#define SCM_CELL_WORD_1(X) SCM_CDR (X)
-#endif
-
-#define scm_bits_t SCM
-
-#define fix_guile_1_3_4_scm_puts(scm_data, port) scm_puts ((char*)scm_data, port)
-#define scm_puts(scm_data, port) fix_guile_1_3_4_scm_puts (scm_data, port)
-#endif
-
 /* Guile 1.4.x compatibility */
 #if GUILE_MINOR_VERSION < 5
 
@@ -71,6 +52,9 @@
 #define scm_set_current_module(x) (void)x
 #define scm_c_resolve_module(x) (SCM)0
 
+inline scm_c_make_vector  (int k, SCM val) {
+  return scm_make_vector (SCM_MAKINUM (k), val);
+}
 #define scm_c_define_gsubr scm_make_gsubr
 #define scm_c_eval_string(str) gh_eval_str ((char*)str)
 #define scm_c_memq scm_sloppy_memq
@@ -81,6 +65,8 @@
 #define SCM_STRING_LENGTH SCM_LENGTH
 #define SCM_SYMBOL_CHARS SCM_CHARS
 #define SCM_SYMBOL_LENGTH SCM_LENGTH
+#define SCM_VECTOR_LENGTH SCM_LENGTH
+
 #endif