X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fwarn.hh;h=d2b1722adcac8b4a32eb663bb49c0561c96ba7fc;hb=15d18de2d67d5fc19a66fbb73aa274779d153d8e;hp=e58ed4887af021154f04383ea6a9986a5289860d;hpb=e87d9c881c1ac0dc5d243c7a0f62cb41a02bb3b8;p=lilypond.git

diff --git a/flower/include/warn.hh b/flower/include/warn.hh
index e58ed4887a..d2b1722adc 100644
--- a/flower/include/warn.hh
+++ b/flower/include/warn.hh
@@ -3,20 +3,19 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef WARN_HH
 #define WARN_HH
 
-#include "string.hh"
+#include "std-string.hh"
 
-void error (String message_string);
-void message (String s);
-void non_fatal_error (String);
-void programming_error (String s);
-void warning (String message_string);
-
-#define progress_indication message
+void error (string s);
+void message (string s);
+void non_fatal_error (string);
+void programming_error (string s);
+void progress_indication (string s);
+void warning (string s);
 
 #endif /* WARN_HH */