release: 1.3.102

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

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index be8a39ff6f19a0284a26f655af288f39e689e525..d69322d91b62958bd31f6388f3054117b08b1433 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -11,6 +11,10 @@
 
 #include <guile/gh.h>
 #include <libguile.h>
+
+#define fix_guile_1_3_4_scm_puts(scm_data, port) scm_puts ((char*)scm_data, port)
+#define scm_puts(scm_data, port) fix_guile_1_3_4_scm_puts (scm_data, port)
+
 #include "direction.hh"
 #include "flower-proto.hh"
 
@@ -29,8 +33,6 @@
  */
 SCM ly_str02scm (char const*c);
 SCM ly_deep_copy (SCM);
-
-
 SCM ly_symbol2scm (char const *);
 String ly_scm2string (SCM s);
 String ly_symbol2string (SCM);
@@ -47,7 +49,9 @@ SCM ly_type (SCM);
 /*
   display and print newline.
  */
+extern "C" { 
 void ly_display_scm (SCM s);
+}
 
 #include "array.hh"
 
@@ -77,14 +81,29 @@ SCM index_set_cell (SCM cellp, Direction d, SCM val);
 void add_scm_init_func (void (*)());
 
 
+typedef SCM(*Scheme_function_unknown)();
+
+#if __GNUC_MINOR__ >= 96
+typedef SCM(*Scheme_function_0)();
+typedef SCM(*Scheme_function_1)(SCM);
+typedef SCM(*Scheme_function_2)(SCM,SCM);       
+#else
+typedef SCM(*Scheme_function_0)(...);
+typedef SCM(*Scheme_function_1)(...);
+typedef SCM(*Scheme_function_2)(...);
+#endif
+
+#define DECLARE_SCHEME_CALLBACK(NAME,ARGS) \
+       static SCM NAME ARGS; \
+       static SCM NAME ## _proc
 
-#define MAKE_SCHEME_CALLBACK(TYPE, FUNC) \
-static SCM TYPE ## _ ## FUNC ## _proc;\
+#define MAKE_SCHEME_CALLBACK(TYPE, FUNC, ARGCOUNT) \
+SCM TYPE :: FUNC ## _proc;\
 void                                                           \
 TYPE ## _ ## FUNC ## _init_functions ()                                        \
 {                                                              \
-  TYPE ## _ ## FUNC ## _proc = gh_new_procedure1_0 (#TYPE "::" #FUNC, \
-  (SCM(*)(...))TYPE :: FUNC);                          \
+  TYPE :: FUNC ## _proc = gh_new_procedure ## ARGCOUNT  ## _0 (#TYPE "::" #FUNC, \
+  ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC));                               \
 }                                                              \
                                                                \
 ADD_SCM_INIT_FUNC(TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions);       \