(sane_setenv)[!ARGV0_RELOCATION]: Also define.

(setup_guile_env): Use it instead of nonstandard setenv.  Fixes
mingw build.

diff --git a/ChangeLog b/ChangeLog
index 3b3b8ee17e22d4e1e8297b2f9cd6294a20694208..65d123c166f6de19ecc2df873523f6e050aa6225 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-25  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * 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  <hanwen@xs4all.nl>
 
        * scm/lily.scm (lilypond-all): clear anonymous modules after

diff --git a/lily/main.cc b/lily/main.cc
index 162dc08480a74a276c44206080044d55c5be5d9f..119a2c416165c5e9d1e4edc7b87d5c75aea448fb 100644 (file)
--- 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);
 }