From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 13 Jul 2005 20:30:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.7.1~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e667ae52b548f116c876c36ebe30b7486abf33fe;p=lilypond.git

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

diff --git a/ChangeLog b/ChangeLog
index ab728bbb06..49d372ac88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-12  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lily/lily-parser-scheme.cc (LY_DEFINE): Guile 1.6 fix.
+
 2005-07-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* scm/output-socket.scm (grob-bbox): don't use inf? 
@@ -51,12 +55,14 @@
 
 2005-07-13  Graham Percival  <gperlist@shaw.ca>
 
-	* input/regression/slur-extreme.ly, input/regression/slur-scoring.ly,
-	lily/slur-configuration.cc, lily/slur.cc, mf/feta-din-code.mf,
-	mf/feta-timesig.mf, mf/parmesan-heads.mf, scm/define-grob-properties.scm:
-	Change "excentricity" to "eccentricity".
+	* input/regression/slur-extreme.ly,
+	input/regression/slur-scoring.ly, lily/slur-configuration.cc,
+	lily/slur.cc, mf/feta-din-code.mf, mf/feta-timesig.mf,
+	mf/parmesan-heads.mf, scm/define-grob-properties.scm: Change
+	"excentricity" to "eccentricity".
 
-	* Documentation/user/converters.itely: fix URL for Noteedit and Rosegarden.
+	* Documentation/user/converters.itely: fix URL for Noteedit and
+	Rosegarden.
 
 	* THANKS: added Yoshinobu Isizaki.
 
diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 27cf5e5e5c..5563f7dea5 100644
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -225,6 +225,6 @@ LY_DEFINE (ly_parser_output_name, "ly:parser-output-name",
   Lily_parser *p = unsmob_lily_parser (parser);
   SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
 
-  return scm_from_locale_string (p->output_basename_.to_str0 ());
+  return scm_makfrom0str (p->output_basename_.to_str0 ());
 }
 
diff --git a/lily/main.cc b/lily/main.cc
index 1efd32303b..9a34bc2959 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -726,9 +726,25 @@ parse_argv (int argc, char **argv)
     }
 }
 
+#ifdef __MINGW32__
+#  include "windows.h"
+#  ifndef INVALID_HANDLE
+#    define INVALID_HANDLE ((void*) -1)
+#  endif
+#endif
+
 int
 main (int argc, char **argv)
 {
+#ifdef __MINGW32__
+  /* Possible gs.exe fix for DOS-based Windowses.  */
+  if (GetStdHandle (STD_OUTPUT_HANDLE) == INVALID_HANDLE)
+    {
+      freopen ("nul$", "w", stdout);
+      freopen ("nul$", "w", stderr);
+    }
+#endif
+
   setup_localisation ();
   setup_paths (argv[0]);
   parse_argv (argc, argv);