* lily/rest.cc (y_offset_callback): only use direction if

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 8e73ac95f3f4ad036aee00ec86508a87da6d1e54..67e22fb04e8d33d714899303fa444111a1043ba0 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -184,7 +184,7 @@ static Long_option_init options_static[]
   {0, 0, 0, 0}
 };
 
-const char *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
+char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
 
 static void
 env_var_info (FILE *out, char const *key)
@@ -300,10 +300,10 @@ do_chroot_jail ()
       USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX
     };
 
-  vector<string> components = split_string (jail_spec, ',');
+  vector<string> components = string_split (jail_spec, ',');
   if (components.size () != JAIL_MAX)
     {
-      error (_f ("expected %d arguments with jail, found: %d", JAIL_MAX,
+      error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX,
                 components.size ()));
       exit (2);
     }
@@ -402,7 +402,7 @@ main_with_guile (void *, int, char **)
        + init_scheme_variables + "))";
 
       init_scheme_code_string
-       += "(begin #t "
+       = "(begin #t "
        + init_scheme_variables
        + init_scheme_code_string
        + ")";
@@ -590,7 +590,7 @@ parse_argv (int argc, char **argv)
 void
 setup_guile_env ()
 {
-  char *yield = getenv ("LILYPOND_GC_YIELD");
+  const char *yield = getenv ("LILYPOND_GC_YIELD");
   bool overwrite = true;
   if (!yield)
     {