CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/07/13 20:30:47

Modified files:
        lily           : main.cc lily-parser-scheme.cc 
        .              : ChangeLog 

Log message:
        

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.264&tr2=1.265&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lily-parser-scheme.cc.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3877&tr2=1.3878&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3877 lilypond/ChangeLog:1.3878
--- lilypond/ChangeLog:1.3877   Wed Jul 13 20:24:49 2005
+++ lilypond/ChangeLog  Wed Jul 13 20:30:47 2005
@@ -1,3 +1,7 @@
+2005-07-12  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+       * lily/lily-parser-scheme.cc (LY_DEFINE): Guile 1.6 fix.
+
 2005-07-13  Han-Wen Nienhuys  <[EMAIL PROTECTED]>
 
        * scm/output-socket.scm (grob-bbox): don't use inf? 
@@ -51,12 +55,14 @@
 
 2005-07-13  Graham Percival  <[EMAIL PROTECTED]>
 
-       * 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.
 
Index: lilypond/lily/lily-parser-scheme.cc
diff -u lilypond/lily/lily-parser-scheme.cc:1.17 
lilypond/lily/lily-parser-scheme.cc:1.18
--- lilypond/lily/lily-parser-scheme.cc:1.17    Mon Jul 11 12:51:13 2005
+++ lilypond/lily/lily-parser-scheme.cc Wed Jul 13 20:30:47 2005
@@ -225,6 +225,6 @@
   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 ());
 }
 
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.264 lilypond/lily/main.cc:1.265
--- lilypond/lily/main.cc:1.264 Tue Jun 14 00:19:37 2005
+++ lilypond/lily/main.cc       Wed Jul 13 20:30:47 2005
@@ -726,9 +726,25 @@
     }
 }
 
+#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);


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to