* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / warn.cc

diff --git a/lily/warn.cc b/lily/warn.cc
index a8d50a36bef6ebc8a9a3da7a5a057616ae3893ac..87a14516c590f6c38f0fc50f9bfe7fea844a7af1 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -3,36 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "proto.hh"
-#include "plist.hh"
-#include "debug.hh"
-#include "my-lily-lexer.hh"
-#include "moment.hh"
-#include "time-description.hh"
-#include "source-file.hh"
-#include "source.hh"
-#include "main.hh"
-#include "input.hh"
-
-ostream &warnout (cerr);
-ostream *mlog (&cerr);
-
+#include <stdio.h>
 
+#include "string.hh"
+#include "main.hh"
 
 void
-error_t (String const & s, Moment const & r)
+progress_indication (String s)
 {
-  String t_mom = r.trunc_rat ().str () +  (r - r.trunc_rat ()).str ();
-  String e=s+ " (t = " +  t_mom + ")";
-  error (e);
+ fputs (s.to_str0 (), stderr);
+ fflush (stderr);
 }
 
-void
-error_t (String const & s, Time_description const &t_tdes)
-{
-  String e=s+ " (at t=" +  to_str (t_tdes.bars_i_) + ": " +  (t_tdes.whole_in_measure_).str () + ")\n";
-  error (e);
-}