lilypond-0.1.47

diff --git a/lily/Makefile b/lily/Makefile
index 16f59f5d5c660768787c8965626f5875ecefe313..be43876df37bd7eb11c9ba0e77df5714bb5f267f 100644 (file)
--- a/lily/Makefile
+++ b/lily/Makefile
@@ -38,13 +38,16 @@ EXTRA_DISTFILES = VERSION
 # list of custom libraries:
 #
 MODULE_LIBDEPS= check-flower-deps check-lib-deps 
-MODULE_LIBES= -llily -lflower
+MODULE_LIBES= -llily -lflower  -lmcheck
 
 #
 
 # main target of this module:
 #
+
 default: $(EXECUTABLE)
+
+out/engraver.o: include/engraver.hh
 #
 include ./$(depth)/make/Files.make 
 

diff --git a/lily/debug.cc b/lily/debug.cc
index c369f070ee96c5f93fc5e01ad73ba505a9972613..f90e2e49eb1767375760d4241c25176d231e6000 100644 (file)
--- a/lily/debug.cc
+++ b/lily/debug.cc
@@ -8,7 +8,9 @@
  */
 #include <fstream.h>
 #include <signal.h>
-#include <std/new.h>
+
+// libg++ 2.8.0
+// #include <std/new.h>
 #include <stdlib.h>
 #include "debug.hh"
 #include "dstream.hh"
@@ -59,7 +61,8 @@ debug_init()
 {
   rat_printer = print_rat;
 #ifndef NDEBUG
-  set_new_handler (&mynewhandler);
+  // libg++ 2.8.0 doesn't have set_new_handler
+  // set_new_handler (&mynewhandler);
 #endif
   set_flower_debug (*monitor, check_debug);
 
@@ -74,6 +77,9 @@ bool check_malloc_b = false;
 // #define MEMORY_PARANOID
 
 #ifdef MEMORY_PARANOID
+
+#include <malloc.h>
+
 void *
 operator new (size_t size)
 {
@@ -103,5 +109,10 @@ set_debug (bool b)
   check_debug =b;
   set_flower_debug (*monitor, check_debug);
   check_malloc_b = experimental_features_global_b;
+#ifdef MEMORY_PARANOID
+  if (check_malloc_b)
+    if (mcheck (0))
+      warning ("Can't set mem-checking!");
+#endif
 }