Merge with master

[lilypond.git] / lily / include / parse-scm.hh

diff --git a/lily/include/parse-scm.hh b/lily/include/parse-scm.hh
index 79ef343ebf1f014230e06368e3f895074645b8c8..2939bc2f5c228702476732a828343257e8c586c9 100644 (file)
--- a/lily/include/parse-scm.hh
+++ b/lily/include/parse-scm.hh
@@ -3,8 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef PARSE_SCM_HH
@@ -14,10 +13,11 @@
 #include "lily-guile.hh"
 
 extern bool parse_protect_global;
+extern bool parsed_objects_should_be_dead;
 
 struct Parse_start
 {
-  char const* str;
+  char const *str;
   int nchars;
   Input start_location_;
   bool safe_;