From d37a5ae50d85ba189d5050096d1c2ac41dd15904 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Fri, 21 Oct 2005 15:21:53 +0000
Subject: [PATCH] (GUILE_ELLIPSIS): define to get clean compile on MOSX

---
 ChangeLog                       |  5 +++++
 Documentation/topdocs/NEWS.tely |  2 +-
 input/test/boxed-stencil.ly     |  2 +-
 lily/include/lily-guile.hh      | 19 ++++++++++++++-----
 lily/include/ly-module.hh       |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1577a55b8c..f7962d78f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-10-21  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* 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().
diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index b8fb79aea9..b987933159 100644
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -188,7 +188,7 @@ Texts over multi measure rests can stretch the corresponding measure,
 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
diff --git a/input/test/boxed-stencil.ly b/input/test/boxed-stencil.ly
index 415853155d..6ff226d390 100644
--- a/input/test/boxed-stencil.ly
+++ b/input/test/boxed-stencil.ly
@@ -21,7 +21,7 @@ grob. " }
   \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 
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index ad01de3694..920f9968b9 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -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 @@ SCM ly_kpathsea_find_file (SCM);
 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_1) (SCM);
 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
diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh
index c7c16ee7c5..17b5e804c1 100644
--- a/lily/include/ly-module.hh
+++ b/lily/include/ly-module.hh
@@ -23,7 +23,7 @@ void clear_anonymous_modules ();
 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
 
-- 
2.39.5