(LY_DEFINE): ly_kpathsea_expand_variable. New

[lilypond.git] / lily / global-context.cc

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 580479bb94f46c5e43ece28e13afd5cde3f7a52f..66e164c3834337bf02d66a687e97b3e13e8d65c0 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -89,7 +89,7 @@ Score_context*
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-    ? dynamic_cast<Score_context*> (unsmob_context (scm_car (context_list_)))
+    ? dynamic_cast<Score_context*> (unsmob_context (ly_car (context_list_)))
     : 0;
 }
 
@@ -172,9 +172,9 @@ Global_context::apply_finalizations ()
 {
   SCM lst = get_property ("finalizations");
   set_property ("finalizations", SCM_EOL);
-  for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s))
+  for (SCM s = lst; scm_is_pair (s); s = ly_cdr (s))
     /* TODO: make safe.  */
-    scm_primitive_eval (scm_car (s));
+    scm_primitive_eval (ly_car (s));
 }
 
 /* Add a function to execute before stepping to the next time step.  */