X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscore.cc;h=d10023dd8506b5103bed7a09ef673a074cff8574;hb=3278a7a8108ffdd2da3d1b58d05aba7c1b2a5707;hp=895954a01abbfc0aa534683c9cc753c72d7bd98b;hpb=563bb9fc1b7afd3543fe4ed9251d39a995db8737;p=lilypond.git

diff --git a/lily/score.cc b/lily/score.cc
index 895954a01a..d10023dd85 100644
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -28,9 +28,9 @@ using namespace std;
 #include "global-context.hh"
 #include "international.hh"
 #include "lily-parser.hh"
+#include "ly-module.hh"
 #include "main.hh"
 #include "music.hh"
-#include "music.hh"
 #include "output-def.hh"
 #include "paper-book.hh"
 #include "paper-score.hh"
@@ -59,10 +59,10 @@ Score::~Score ()
 {
 }
 
-const char Score::type_p_name_[] = "ly:score?";
+const char * const Score::type_p_name_ = "ly:score?";
 
 SCM
-Score::mark_smob ()
+Score::mark_smob () const
 {
   scm_gc_mark (header_);
   for (vsize i = defs_.size (); i--;)