* .cvsignore: Add aclocal.m4.

* lily/music-constructor.cc: Include <assert.h>.

diff --git a/.cvsignore b/.cvsignore
index 0aa598fe7cded3cdb3bc9e85616ae4007d3f3334..d75e39b58ce434e86dde7a5583181989761c2fad 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -19,6 +19,7 @@
 .gdbinit
 GNUmakefile
 TAGS
+aclocal.m4
 afm
 autom4te.cache
 config.cache

diff --git a/ChangeLog b/ChangeLog
index 503172c186b3f9d4bb163949caa0c099247942ec..b62bf72bf012c03271377e617217a9483ce2d6b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-05-23  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * .cvsignore: Add aclocal.m4.
+
        * lily/music-constructor.cc: Include <assert.h>.
 
 2003-05-23  Han-Wen Nienhuys  <hanwen@cs.uu.nl>

diff --git a/lily/music-constructor.cc b/lily/music-constructor.cc
index 0c39a96a73dc2a6030008bdf40190a03f580682a..ea46865599f8c5c9c0e053ab99500b3e6ff609ef 100644 (file)
--- a/lily/music-constructor.cc
+++ b/lily/music-constructor.cc
@@ -8,6 +8,7 @@
  */
 
 #include <map>                 // UGH.
+#include <assert.h>
 #include "warn.hh"
 #include "music-constructor.hh"
 typedef Music* (*Music_ctor) ();