* lily/include/lily-guile.hh: compatibility glue for 1.6

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index 161bf21ab79caf7144ddd4771727fc13e5d2da2f..ea81bb0df67cef0561bbc48f3342006367ce18d6 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -130,7 +130,7 @@ Music::print_smob (SCM s, SCM p, scm_print_state*)
   Music* m = unsmob_music (s);
 
   SCM nm = m->get_property ("name");
-  if (ly_c_symbol_p (nm) || ly_c_string_p (nm))
+  if (ly_c_symbol_p (nm) || scm_is_string (nm))
     scm_display (nm, p);
   else
     scm_puts (classname (m),p);
@@ -294,7 +294,7 @@ LY_DEFINE (ly_extended_make_music, "ly:make-bare-music",
          "for creating music objects. "
          )
 {
-  SCM_ASSERT_TYPE (ly_c_string_p (type), type, SCM_ARG1, __FUNCTION__, "string");
+  SCM_ASSERT_TYPE (scm_is_string (type), type, SCM_ARG1, __FUNCTION__, "string");
   SCM s = make_music (ly_scm2string (type))->self_scm ();
   unsmob_music (s)->immutable_property_alist_ = props;
   scm_gc_unprotect_object (s);