* The grand 2005-2006 replace.

[lilypond.git] / lily / include / lily-guile.hh

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 672a0df804fdd7197d8b2a0154e2fa014ba011f9..2b1afe115e31ca217836324988ff9aee4c7d0c56 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef 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"
@@ -51,7 +60,9 @@ char *ly_scm2newstr (SCM str, size_t *lenp);
 
 Real robust_scm2double (SCM, double);
 int robust_scm2int (SCM, int);
+Direction robust_scm2dir (SCM, Direction);
 Drul_array<Real> robust_scm2drul (SCM, Drul_array<Real>);
+Drul_array<bool> robust_scm2booldrul (SCM, Drul_array<bool>);
 Interval robust_scm2interval (SCM, Drul_array<Real>);
 Offset robust_scm2offset (SCM, Offset);
 
@@ -67,6 +78,8 @@ SCM alist_to_hashq (SCM);
 SCM ly_alist_vals (SCM alist);
 SCM ly_hash2alist (SCM tab);
 
+int procedure_arity (SCM);
+
 /* inserts at front, removing dublicates */
 inline SCM ly_assoc_front_x (SCM alist, SCM key, SCM val)
 {
@@ -144,7 +157,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
@@ -153,10 +166,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