From: janneke <janneke>
Date: Thu, 4 Aug 2005 20:29:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.6.4~27
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=90bcc101781621545d4a9581e79f5ca194d7dc1b;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 2b701e16de..1578001961 100644
--- 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.  Backport.
+	
 2005-08-04  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/beam.cc (shift_region_to_valid): prevent division by
diff --git a/lily/main.cc b/lily/main.cc
index 7574ca0082..f75b458f4a 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,16 +737,16 @@ 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);
 
 
   char *mb16 = "16777216";
   char *mb1 = "1048576";
   
-  setenv ("SCM_DEFAULT_INIT_HEAP_SIZE_1", mb16, 0);
-  setenv ("SCM_DEFAULT_INIT_HEAP_SIZE_2", mb1, 0);
+  sane_putenv ("SCM_DEFAULT_INIT_HEAP_SIZE_1", mb16, 0);
+  sane_putenv ("SCM_DEFAULT_INIT_HEAP_SIZE_2", mb1, 0);
 }
 
 int
diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 0dad2a827b..af85437d7c 100644
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -325,8 +325,7 @@
     (let* ((font (car font-name-filename))
 	   (name (cadr font-name-filename))
 	   (file-name (caddr font-name-filename))
-	   (bare-file-name (ly:find-file file-name))
-	   )
+	   (bare-file-name (ly:find-file file-name)))
 
       (cons
        (munge-lily-font-name name)