X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fdebug.hh;h=c5928440069b3f9984305cb382549d73f112f063;hb=beb54099cf241daac01cc026dad15211bf19c618;hp=00f0a38e82ecb7dc79210de5ec38aa83f4e2de56;hpb=79511c44a27908a1beaed25bbcac8d95a8a6b7c8;p=lilypond.git

diff --git a/lily/include/debug.hh b/lily/include/debug.hh
index 00f0a38e82..c592844006 100644
--- a/lily/include/debug.hh
+++ b/lily/include/debug.hh
@@ -6,31 +6,12 @@
 #define DEBUG_HH
 
 #include <assert.h>
-#include <iostream.h>
 #include "dstream.hh"
 #include "real.hh"
-#include "proto.hh"
+#include "lily-proto.hh"
+#include "flower-debug.hh"
 #include "warn.hh"
 
-void error_t(const String& s, Time_description const &  t_tdes);
-void error_t(String const &s, const Moment &when);
-
-#define WARN warnout << "warning: "<<__FUNCTION__ << "(): "
-extern ostream &warnout ;
-
-// progress
-extern ostream *mlog;
-
-// debugging
-extern Dstream *monitor; // monitor
-
-
-#ifdef NPRINT
-#define mtor if (0) *monitor	// clever hack 
-#else
-#define mtor if (check_debug) monitor->identify_as(__PRETTY_FUNCTION__)
-#endif
-
-extern bool check_debug;
+void progress_indication (String);
 
 #endif