From 65e4bcba1fc315549d641d65d269e700bd59c495 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 26 Jan 2006 20:00:52 +0000 Subject: [PATCH] (setup_paths): mingw uses std string too. --- ChangeLog | 2 ++ lily/relocate.cc | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33acfab141..805ea68fcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-01-26 Han-Wen Nienhuys + * lily/relocate.cc (setup_paths): mingw uses std string too. + * lily/*.cc: various fixes for substr(ARG). * lily/sustain-pedal.cc (print): diff --git a/lily/relocate.cc b/lily/relocate.cc index 39ecf8670b..1565eb4971 100644 --- 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 (""); -- 2.39.2