* flower/include/std-vector.hh[STD_VECTOR]: Do not include

[lilypond.git] / lily / relocate.cc

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 39ecf8670bcc174a191db6f2a42323950673a32d..4e5669c7aa9a13814620bc91a9e2ca5d81438e1e 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -182,7 +182,7 @@ setup_paths (char const *argv0_ptr)
       std::string prefix = getenv ("LILYPOND_RELOCATE_PREFIX");
 #ifdef __MINGW32__
       /* Normalize file name.  */
-      prefix = File_name (prefix).to_string ().get_copy_str0 ();
+      prefix = File_name (prefix).to_string ();
 #endif /* __MINGW32__ */
       prefix_relocation (prefix);
       std::string bindir = prefix + "/bin";
@@ -237,11 +237,13 @@ setup_paths (char const *argv0_ptr)
   /* FIXME: use LILYPOND_DATADIR.  */
   if (char const *env = getenv ("LILYPONDPREFIX"))
     {
+
 #ifdef __MINGW32__
       /* Normalize file name.  */
-      env = File_name (env).to_string ().get_copy_str0 ();
-#endif
+      prefix_directory = File_name (env).to_string ();
+#else
       prefix_directory = env;
+#endif
     }
 
   global_path.append ("");
@@ -269,18 +271,18 @@ setup_paths (char const *argv0_ptr)
   char *suffixes[] = {"ly", "ps", "scm", 0 };
 
   
-  Array<std::string> dirs;
+  std::vector<std::string> dirs;
   for (char **s = suffixes; *s; s++)
     {
       std::string path = prefix_directory + to_string ('/') + std::string (*s);
-      dirs.push (path);
+      dirs.push_back (path);
     }
 
 
-  dirs.push (prefix_directory + "/fonts/otf/");
-  dirs.push (prefix_directory + "/fonts/type1/");
-  dirs.push (prefix_directory + "/fonts/svg/");
+  dirs.push_back (prefix_directory + "/fonts/otf/");
+  dirs.push_back (prefix_directory + "/fonts/type1/");
+  dirs.push_back (prefix_directory + "/fonts/svg/");
   
-  for (int i = 0; i < dirs.size (); i++)
+  for (vsize i = 0; i < dirs.size (); i++)
     global_path.prepend (dirs[i]);
 }