Issue 4464/2: include hygiene: break cycles, remove duplicate includes etc.

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

diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh
index 0a7fdc8726c7a305fd099eb6a7f6af9a3b8f3a97..4b2d3f800a141bca4d2a9c35da0a4b454969227b 100644 (file)
--- a/lily/include/ly-module.hh
+++ b/lily/include/ly-module.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,25 +22,14 @@
 #include "config.hh"
 #include "lily-guile.hh"
 
-SCM ly_make_anonymous_module (bool safe);
+SCM ly_make_module (bool safe);
 SCM ly_module_copy (SCM dest, SCM src);
 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);
 void ly_reexport_module (SCM mod);
-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);
 
-/* For backward compatability with Guile 1.8 */
-#if !HAVE_GUILE_HASH_FUNC
-typedef SCM (*scm_t_hash_fold_fn) (GUILE_ELLIPSIS);
-typedef SCM (*scm_t_hash_handle_fn) (GUILE_ELLIPSIS);
-#endif
-
-#define MODULE_GC_KLUDGE
-
 #endif /* LY_MODULE_HH */