Merge with master

[lilypond.git] / lily / include / music-output.hh

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index d0021bfacca8fe32742a81fed67856d0ebbe7ba3..c7c3b82bd5af0d97bff020245de61aca16d91422 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MUSIC_OUTPUT_HH
 #define MUSIC_OUTPUT_HH
 
-#include "string.hh"
+#include "std-string.hh"
 #include "lily-proto.hh"
 #include "protected-scm.hh"
 #include "smobs.hh"
@@ -17,7 +17,7 @@
 
 class Music_output
 {
-  DECLARE_SMOBS (Music_output, foo);
+  DECLARE_SMOBS (Music_output);
   DECLARE_CLASSNAME(Music_output);
 protected:
   Music_output ();