From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 14 Jan 2005 11:55:16 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.14~266
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1081732046b59df1d2a429e0a11ff4f8140bcf92;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 6fb9437fa3..93667f87a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -121,7 +121,6 @@
 	* Documentation/user/notation.itely (Ancient rests): Fix typo
 	(thanks Anthony)
 
->>>>>>> 1.3051
 2005-01-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* scm/auto-beam.scm (score-override-auto-beam-setting): New function.
diff --git a/lily/include/music-constructor.hh b/lily/include/music-constructor.hh
index c059abfdc7..a4d2864a3c 100644
--- a/lily/include/music-constructor.hh
+++ b/lily/include/music-constructor.hh
@@ -11,6 +11,7 @@
 #define MUSIC_CONSTRUCTOR_HH
 
 #include "lily-guile.hh"
+#include "lily-proto.hh"
 #include "string.hh"
 #include "global-ctor.hh"
 
@@ -24,7 +25,8 @@ static void  _ ## type ## _adder () {\
 }\
 ADD_SCM_INIT_FUNC( _ ## type ## _adder_prefix,  _ ## type ## _adder);
 
-void add_music_ctor (String, Music* (*) (SCM));
+typedef Music *(*Music_ctor) (SCM);
+void add_music_ctor (String, Music_ctor);
 Music*make_music (String, SCM);
 
 
diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh
index ac7483f0ff..4d9c292438 100644
--- a/lily/include/music-wrapper.hh
+++ b/lily/include/music-wrapper.hh
@@ -22,7 +22,7 @@
 class Music_wrapper : public Music
 {
 public:
-  Music_wrapper ();
+  Music_wrapper (SCM);
   VIRTUAL_COPY_CONSTRUCTOR (Music, Music_wrapper);
 
   Music *element () const;
diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index a17a631039..d6995ac664 100644
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -9,8 +9,8 @@
 
 #include "music-wrapper.hh"
 
-Music_wrapper::Music_wrapper ()
-  : Music ()
+Music_wrapper::Music_wrapper (SCM x)
+  : Music (x)
 {
 }