X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-def-scheme.cc;h=65673c8a9ec71a6238104e70621f1313b224f810;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=e78eff0673375d921eaeeb6cecf3cf0ffcb5f240;hpb=0c14539bc83d6bb405141b6f21430b33d1e8fcf0;p=lilypond.git

diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index e78eff0673..65673c8a9e 100644
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -101,8 +101,8 @@ LY_DEFINE (ly_output_description, "ly:output-description",
     {
       Context_def *td = unsmob<Context_def> (scm_cdar (s));
       SCM key = scm_caar (s);
-      if (td && key == td->get_context_name ())
-	ell = scm_cons (scm_cons (key, td->to_alist ()), ell);
+      if (td && scm_is_eq (key, td->get_context_name ()))
+        ell = scm_cons (scm_cons (key, td->to_alist ()), ell);
     }
   return ell;
 }
@@ -132,7 +132,7 @@ LY_DEFINE (ly_output_find_context_def, "ly:output-find-context-def",
 }
 
 const char
-Output_def::type_p_name_[] = "ly:output-def?";
+* const Output_def::type_p_name_ = "ly:output-def?";
 
 LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale",
 	   1, 0, 0, (SCM def),
@@ -195,7 +195,7 @@ LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
     }
 
   SCM alist2 = SCM_EOL;
-  if (scm_hash_table_p (tab2) == SCM_BOOL_T)
+  if (scm_is_true (scm_hash_table_p (tab2)))
     {
       // strip original-fonts/pango-font-descriptions
       alist2 = scm_append (ly_alist_vals (ly_hash2alist (tab2)));