* flower/include/guile-compatibility.hh (SCM_I_CONSP): add

SCM_I_CONSP

* lily/include/lily-guile.hh: inline scm_c[ad]r, scm_is_pair.

diff --git a/ChangeLog b/ChangeLog
index 8a2e6912b9917531f4b9e996b56856426c304171..279501be59a91ea2f3fa0cbac4874c365acb8314 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-07-24  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * flower/include/guile-compatibility.hh (SCM_I_CONSP): add
+       SCM_I_CONSP
+
        * Documentation/user/invoking.itely (Invoking lilypond): add
        LILYPOND_GC_YIELD documentation.
 

diff --git a/flower/include/guile-compatibility.hh b/flower/include/guile-compatibility.hh
index 98cc83b22a2f5f74928fd8a8bf3e4f05e92c6473..a3a1a511f0de492f1eb46d513a871dee2e8c16db 100644 (file)
--- a/flower/include/guile-compatibility.hh
+++ b/flower/include/guile-compatibility.hh
@@ -24,6 +24,7 @@ inline SCM scm_car (SCM x)
     abort ();
   return SCM_CAR (x);
 }
+#define SCM_I_CONSP(x) SCM_CONSP(x)
 inline SCM scm_caar (SCM x) { return SCM_CAAR (x); }
 inline SCM scm_cdar (SCM x) { return SCM_CDAR (x); }
 inline SCM scm_cadr (SCM x) { return SCM_CADR (x); }

diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc
index fb3c13251158eb8538fc59fd83c0343ed96e2ea8..f54bcc97a9d8d68601cbd1a58c11425b046f337f 100644 (file)
--- a/lily/bar-number-engraver.cc
+++ b/lily/bar-number-engraver.cc
@@ -53,7 +53,7 @@ Bar_number_engraver::process_music ()
              create_items ();
              // guh.
              text_->set_property
-               ("text", scm_makfrom0str (to_string (scm_to_int (bn)).to_str0 ()));
+               ("text", scm_number_to_string (bn, scm_from_int (10)));
            }
        }
     }

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 29db1df39676677b83aa2cdc207378cbaa2c93cc..803be9db63e9134a801868f85c9c885a0d8da050 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -163,7 +163,10 @@ typedef SCM (*Scheme_function_3) (...);
 
 #define scm_cdr ly_cdr 
 #define scm_car ly_car
+
+#ifndef scm_is_pair
 #define scm_is_pair ly_is_pair
+#endif
 
 inline SCM ly_car (SCM x) { return SCM_CAR (x); }
 inline SCM ly_cdr (SCM x) { return SCM_CDR (x); }