*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 985c9113c1d2497068531bdf8e96590ee243d07a..6ec96d8683acb093917dfd7eeff854b45561cfeb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,11 @@
 
 2005-04-05  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * lily/midi-stream.cc: Handle unwritable midi file.
+       * lily/grob.cc (mark_smob): Check pscore->layout_ before
+       dereferencing.  Fixes make web.
+
+       * lily/midi-stream.cc: Handle unwritable midi file.  Include
+       errno.h.
 
        * Documentation/user/: Fix links.
 

diff --git a/lily/grob.cc b/lily/grob.cc
index ea8c1a5609dea115639765c6cb0e110acc960444..9d57cb094da345084eb04080e1a8c9ff699ebde7 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -664,7 +664,7 @@ Grob::mark_smob (SCM ses)
   if (s->original_)
     scm_gc_mark (s->original_->self_scm ());
 
-  if (s->pscore_)
+  if (s->pscore_ && s->pscore_->layout_)
     scm_gc_mark (s->pscore_->layout_->self_scm ());
 
   s->do_derived_mark ();

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 7651b3fe6f3e161cf01e86c9e26d9626649364cd..7c697dc2a87dcbb202021cae25e5c2349ff5aea1 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -7,10 +7,10 @@
 */
 
 
-#include <errno.h>
-
 #include "midi-stream.hh"
 
+#include <errno.h>
+
 #include "stream.hh"
 #include "string-convert.hh"
 #include "main.hh"