Fix #250.

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

diff --git a/flower/include/warn.hh b/flower/include/warn.hh
index 2464a8c48e7f223bd10e8ee7dbc22c56c35ce5b5..d2b1722adcac8b4a32eb663bb49c0561c96ba7fc 100644 (file)
--- a/flower/include/warn.hh
+++ b/flower/include/warn.hh
@@ -3,20 +3,19 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 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 */