Issue 4568: Check in Texinfo from upstream svn://svn.savannah.gnu.org/texinfo/trunk...

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 69af225c7651f4c117b34b050abcea564aa1a1d2..1283bcfcc671ebffdb398864a6f74705fe06911e 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -25,7 +25,6 @@
 #include <cstring>
 #include <cerrno>
 #include <cstdio>
-using namespace std;
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -55,6 +54,7 @@ using namespace std;
 #include "string-convert.hh"
 #include "version.hh"
 #include "warn.hh"
+#include "lily-imports.hh"
 
 /*
  * Global options that can be overridden through command line.
@@ -129,7 +129,7 @@ static char const *WARRANTY
 //string lilypond_datadir; // moved to global-data.cc
 
 /* The jail specification: USER, GROUP, JAIL, DIR. */
-string jail_spec;
+std::string jail_spec;
 
 /*  The option parser */
 static Getopt_long *option_parser = 0;
@@ -213,6 +213,10 @@ configure_fpu ()
 
 #endif /* defined(__x86__) || defined(__i386__) */
 
+using std::map;
+using std::string;
+using std::vector;
+
 static void
 env_var_info (FILE *out, char const *key)
 /*
@@ -532,8 +536,8 @@ main_with_guile (void *, int, char **)
   // SCM result = scm_call_1 (
   //                      scm_variable_ref (call_with_error_handling),
   //                      scm_call_1 (ly_lily_module_constant ("lilypond-main"), files));
-  SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files);
-  (void) result;
+
+  Lily::lilypond_main (files);
 
   /* Unreachable.  */
   exit (0);