From 0048e68829a9c9b3decb593b3554b0769436091a Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 25 Jul 2005 21:57:29 +0000 Subject: [PATCH] (sane_setenv)[!ARGV0_RELOCATION]: Also define. (setup_guile_env): Use it instead of nonstandard setenv. Fixes mingw build. --- ChangeLog | 6 ++++++ lily/main.cc | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b3b8ee17e..65d123c166 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-25 Jan Nieuwenhuizen + + * lily/main.cc (sane_setenv)[!ARGV0_RELOCATION]: Also define. + (setup_guile_env): Use it instead of nonstandard setenv. Fixes + mingw build. + 2005-07-25 Han-Wen Nienhuys * scm/lily.scm (lilypond-all): clear anonymous modules after diff --git a/lily/main.cc b/lily/main.cc index 162dc08480..119a2c4161 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -259,7 +259,6 @@ warranty () printf (_ (WARRANTY).to_str0 ()); } -#if ARGV0_RELOCATION static int sane_putenv (char const* key, String value, bool overwrite = true) { @@ -272,6 +271,7 @@ sane_putenv (char const* key, String value, bool overwrite = true) return -1; } +#if ARGV0_RELOCATION static int set_env_file (char const* key, String value) { @@ -737,9 +737,9 @@ setup_guile_env () overwrite = false; } - setenv ("GUILE_MIN_YIELD_1", yield, overwrite); - setenv ("GUILE_MIN_YIELD_2", yield, overwrite); - setenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite); + sane_putenv ("GUILE_MIN_YIELD_1", yield, overwrite); + sane_putenv ("GUILE_MIN_YIELD_2", yield, overwrite); + sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite); } -- 2.39.2