X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcoherent-ligature-engraver.cc;h=1fad0f9b24e6a300bd7d6c0c0aa184343ba714a2;hb=77dba2aad902de14961ca17d32e3551eba7bab08;hp=337415743fd594a6ce90ee639947fb329b8ed706;hpb=2536405e9584f63d559653183971c0fec57ba037;p=lilypond.git

diff --git a/lily/coherent-ligature-engraver.cc b/lily/coherent-ligature-engraver.cc
index 337415743f..1fad0f9b24 100644
--- a/lily/coherent-ligature-engraver.cc
+++ b/lily/coherent-ligature-engraver.cc
@@ -7,7 +7,7 @@
  */
 
 #include "coherent-ligature-engraver.hh"
-#include "item.hh"
+
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
 #include "spanner.hh"
@@ -128,9 +128,9 @@ Coherent_ligature_engraver::get_set_column (Item *item, Paper_column *column)
       Grob *sl = Staff_symbol_referencer::get_staff_symbol (item);
       for (SCM tail = parent->get_property ("elements");
 	   scm_is_pair (tail);
-	   tail = ly_cdr (tail))
+	   tail = scm_cdr (tail))
 	{
-	  Item *sibling = unsmob_item (ly_car (tail));
+	  Item *sibling = unsmob_item (scm_car (tail));
 	  if ((sibling) &&
 	      (Staff_symbol_referencer::get_staff_symbol (sibling) == sl))
 	    {