*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 6fb9437fa3cf677f25d9a37dbab0e83e082bf0da..93667f87a12e8e967570eb1f25937b25e9675568 100644 (file)
--- 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 c059abfdc7b3975964825f39b9970edae6cbbec3..a4d2864a3c3018c7074e6ba634fbeaab39f5531e 100644 (file)
--- 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 ac7483f0ff803e4568b13151657a2a22942a3912..4d9c2924383d45674da7152b9c0d858bf52587e6 100644 (file)
--- 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 a17a631039383001e0e3a71c5ed2c94f9db1a7b9..d6995ac664988b55182f7cf04e5f3d6a9aa50ea1 100644 (file)
--- 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)
 {
 }