CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/21 15:21:53
Modified files:
. : ChangeLog
Documentation/topdocs: NEWS.tely
input/test : boxed-stencil.ly
lily/include : lily-guile.hh ly-module.hh
Log message:
(GUILE_ELLIPSIS): define to get clean
compile on MOSX
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4204&tr2=1.4205&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.104&tr2=1.105&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/boxed-stencil.ly.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-guile.hh.diff?tr1=1.166&tr2=1.167&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/ly-module.hh.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4204 lilypond/ChangeLog:1.4205
--- lilypond/ChangeLog:1.4204 Fri Oct 21 14:07:47 2005
+++ lilypond/ChangeLog Fri Oct 21 15:21:51 2005
@@ -1,5 +1,10 @@
2005-10-21 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/include/lily-guile.hh (GUILE_ELLIPSIS): define to get clean
+ compile on MOSX
+
+ * python/convertrules.py (conv): add rules.
+
* lily/grob.cc: remove is_empty()
* lily/grob-property.cc: remove add_to_list_property().
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.104
lilypond/Documentation/topdocs/NEWS.tely:1.105
--- lilypond/Documentation/topdocs/NEWS.tely:1.104 Fri Oct 21 13:54:31 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Fri Oct 21 15:21:53 2005
@@ -188,7 +188,7 @@
if the appropriate @code{spring-and-rods} callback is set.
@lilypond[relative=2,fragment,raggedright]
-\override MultiMeasureRestText #'callbacks #'springs-and-rods
+\override MultiMeasureRestText #'springs-and-rods
= #Multi_measure_rest::set_text_rods
c1 R1 R1^"Very long long long text"
@end lilypond
Index: lilypond/input/test/boxed-stencil.ly
diff -u lilypond/input/test/boxed-stencil.ly:1.14
lilypond/input/test/boxed-stencil.ly:1.15
--- lilypond/input/test/boxed-stencil.ly:1.14 Fri Oct 21 14:32:27 2005
+++ lilypond/input/test/boxed-stencil.ly Fri Oct 21 15:21:53 2005
@@ -21,7 +21,7 @@
\override Score.RehearsalMark #'stencil =
#(make-stencil-boxer 0.15 0.3 Text_interface::print)
b8
- \revert Stem % stencil
+ \revert Stem #'stencil
c4. c4 \mark "F" c1
Index: lilypond/lily/include/lily-guile.hh
diff -u lilypond/lily/include/lily-guile.hh:1.166
lilypond/lily/include/lily-guile.hh:1.167
--- lilypond/lily/include/lily-guile.hh:1.166 Mon Oct 3 11:15:56 2005
+++ lilypond/lily/include/lily-guile.hh Fri Oct 21 15:21:53 2005
@@ -15,6 +15,15 @@
#include <libguile.h>
+
+/*
+ Hack for various MacOS incarnations.
+ */
+#ifndef GUILE_ELLIPSIS
+#define GUILE_ELLIPSIS
+#endif
+
+
#include "guile-compatibility.hh"
#include "interval.hh"
#include "lily-guile-macros.hh"
@@ -145,7 +154,7 @@
void add_scm_init_func (void (*) ());
extern "C" {
- typedef SCM (*Scheme_function_unknown) ();
+ typedef SCM (*Scheme_function_unknown) (GUILE_ELLIPSIS);
}
#if __GNUC__ > 2 || __GNUC_MINOR__ >= 96
@@ -154,10 +163,10 @@
typedef SCM (*Scheme_function_2) (SCM, SCM);
typedef SCM (*Scheme_function_3) (SCM, SCM, SCM);
#else
-typedef SCM (*Scheme_function_0) (...);
-typedef SCM (*Scheme_function_1) (...);
-typedef SCM (*Scheme_function_2) (...);
-typedef SCM (*Scheme_function_3) (...);
+typedef SCM (*Scheme_function_0) (GUILE_ELLIPSIS);
+typedef SCM (*Scheme_function_1) (GUILE_ELLIPSIS);
+typedef SCM (*Scheme_function_2) (GUILE_ELLIPSIS);
+typedef SCM (*Scheme_function_3) (GUILE_ELLIPSIS);
#endif
#define scm_cdr ly_cdr
Index: lilypond/lily/include/ly-module.hh
diff -u lilypond/lily/include/ly-module.hh:1.15
lilypond/lily/include/ly-module.hh:1.16
--- lilypond/lily/include/ly-module.hh:1.15 Fri Aug 5 15:28:15 2005
+++ lilypond/lily/include/ly-module.hh Fri Oct 21 15:21:53 2005
@@ -23,7 +23,7 @@
SCM ly_use_module (SCM mod, SCM used);
/* Ugh signature of scm_internal_hash_fold () is inaccurate. */
-typedef SCM (*Hash_closure_function) ();
+typedef SCM (*Hash_closure_function) (GUILE_ELLIPSIS);
#define MODULE_GC_KLUDGE
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
