Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / flower / include / warn.hh

diff --git a/flower/include/warn.hh b/flower/include/warn.hh
index f56757f00cb1e1808b0fa7e2fc301b7cce329ce2..eafdccaeca2138c43855fecd88dedcbda092cf92 100644 (file)
--- a/flower/include/warn.hh
+++ b/flower/include/warn.hh
@@ -3,17 +3,19 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2004 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_string);
-void error (String message_string);
-void non_fatal_error (String);
-#endif // WARN_HH
+#endif /* WARN_HH */