lilypond-0.0.17

diff --git a/hdr/proto.hh b/hdr/proto.hh
index ebc4fd1398741010b8e65072ae0186a2d929714e..09465e3e85adb5fd4439b5ede0c95194e0a2bc86 100644 (file)
--- a/hdr/proto.hh
+++ b/hdr/proto.hh
@@ -80,14 +80,16 @@ struct Voice_element;
 struct Voicegroup;
 
 struct Voice_list;
-struct Vertical_music;
-struct Horizontal_music;
-struct Horizontal_simple;
-struct Vertical_simple ;
+struct Input_music;
+struct Simple_music;
+struct Complex_music;
 struct Music_voice;
 struct Music_general_chord;
+
 struct Input_score;
 struct Input_staff;
 struct Input_command;
 struct Notename_tab;
+struct Input_file;
+struct Keyword_table;
 #endif // PROTO_HH

diff --git a/src/identifier.cc b/src/identifier.cc
index 5b552898a96a09ce0b60d04bedd8e384aed499ad..6241768694e77943c9e36d5c3eb630cd27037677 100644 (file)
--- a/src/identifier.cc
+++ b/src/identifier.cc
@@ -2,10 +2,11 @@
 
 #include "identparent.hh"
 #include "lexer.hh"
+#include "debug.hh"
 
 void
 Identifier::error()
 {
     String e("Wrong identifier type: ");
-    yyerror(e + classname());
+    ::error(e + classname());
 }