Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / lily / include / ly-module.hh

diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh
index c7c16ee7c5116491569d8fc88cdf8a1dd4d2f1bb..8b76533f54aaecf9121ddfc0ca7ed12814f81c7c 100644 (file)
--- a/lily/include/ly-module.hh
+++ b/lily/include/ly-module.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef LY_MODULE_HH
 #define LY_MODULE_HH
@@ -12,7 +12,7 @@
 
 SCM ly_make_anonymous_module (bool safe);
 SCM ly_module_copy (SCM dest, SCM src);
-SCM ly_module2alist (SCM mod);
+SCM ly_module_2_alist (SCM mod);
 SCM ly_module_lookup (SCM module, SCM sym);
 SCM ly_modules_lookup (SCM modules, SCM sym, SCM);
 SCM ly_module_symbols (SCM mod);
@@ -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