CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/07/25 21:57:30
Modified files:
lily : main.cc
. : ChangeLog
Log message:
(sane_setenv)[!ARGV0_RELOCATION]: Also define.
(setup_guile_env): Use it instead of nonstandard setenv. Fixes
mingw build.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.267&tr2=1.268&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3927&tr2=1.3928&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3927 lilypond/ChangeLog:1.3928
--- lilypond/ChangeLog:1.3927 Mon Jul 25 11:21:54 2005
+++ lilypond/ChangeLog Mon Jul 25 21:57:29 2005
@@ -1,3 +1,9 @@
+2005-07-25 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* scm/lily.scm (lilypond-all): clear anonymous modules after
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.267 lilypond/lily/main.cc:1.268
--- lilypond/lily/main.cc:1.267 Sun Jul 24 19:31:02 2005
+++ lilypond/lily/main.cc Mon Jul 25 21:57:29 2005
@@ -259,7 +259,6 @@
printf (_ (WARRANTY).to_str0 ());
}
-#if ARGV0_RELOCATION
static int
sane_putenv (char const* key, String value, bool overwrite = true)
{
@@ -272,6 +271,7 @@
return -1;
}
+#if ARGV0_RELOCATION
static int
set_env_file (char const* key, String value)
{
@@ -737,9 +737,9 @@
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);
}
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
