Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh
index 52371605766c95e1908168c7dff1e5c7b362cf23..17595408a71965ab102578136fa83c63d10a600c 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--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef LY_MODULE_HH
 #define LY_MODULE_HH
@@ -17,9 +17,15 @@ SCM ly_module_lookup (SCM module, SCM sym);
 SCM ly_modules_lookup (SCM modules, SCM sym, SCM);
 SCM ly_module_symbols (SCM mod);
 void ly_reexport_module (SCM mod);
-inline bool ly_c_module_p (SCM x) { return SCM_MODULEP (x); }
-void ly_clear_anonymous_modules ();
+inline bool ly_is_module (SCM x) { return SCM_MODULEP (x); }
+SCM ly_clear_anonymous_modules ();
+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) (GUILE_ELLIPSIS);
+
+#define MODULE_GC_KLUDGE
+
 #endif /* LY_MODULE_HH */