Merge branch 'master' into lilypond/translation

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

diff --git a/flower/include/warn.hh b/flower/include/warn.hh
index e63d65ce762177dbe2b9231f0a1d1b7bdeedd54a..10c800c44344db383b1dd1a01aa1691a68581d82 100644 (file)
--- a/flower/include/warn.hh
+++ b/flower/include/warn.hh
@@ -1,19 +1,33 @@
 /*
-  warn.hh -- declare Error message functions
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #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 successful (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 */