X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fwarn.hh;h=eafdccaeca2138c43855fecd88dedcbda092cf92;hb=d31f8b518f7b5f04e7c332e001b1e31c23c39021;hp=e63d65ce762177dbe2b9231f0a1d1b7bdeedd54a;hpb=1ac137fdab1f1be8a5621599664008107b5a9a6a;p=lilypond.git

diff --git a/flower/include/warn.hh b/flower/include/warn.hh
index e63d65ce76..eafdccaeca 100644
--- a/flower/include/warn.hh
+++ b/flower/include/warn.hh
@@ -3,17 +3,19 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef WARN_HH
 #define WARN_HH
 
-#include "string.hh"
+#include "std-string.hh"
+
+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);
 
-void programming_error (String s);
-void warning (String message_str);
-void error (String message_str);
-void non_fatal_error (String);
-#endif // WARN_HH
+#endif /* WARN_HH */