* configure.in: Test for and accept lmodern if EC fonts not found.

[lilypond.git] / lily / parse-scm.cc

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 2ad5a0c1ce5426de046b0d8892753d6686eb3b5b..cb7c7c2618050f5f36906a380b281b1e406e2c4c 100644 (file)
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -6,15 +6,13 @@
   (c) 2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "parse-scm.hh"
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "ly-module.hh"
-#include "lily-guile.hh"
 #include "main.hh"
 #include "paper-book.hh"
-#include "parse-scm.hh"
-#include "string.hh"
 #include "source-file.hh"
 
 /* Pass string to scm parser, evaluate one expression.
@@ -84,7 +82,7 @@ parse_handler (void *data, SCM tag, SCM args)
   ps->start_location_.error (_("GUILE signaled an error for the expression beginning here"));
 
   if (scm_ilength (args) > 2)
-    scm_display_error_message (ly_cadr (args), ly_caddr (args), scm_current_error_port ());
+    scm_display_error_message (scm_cadr (args), scm_caddr (args), scm_current_error_port ());
 
   /*
     The following is a kludge; we should probably search for