X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fly-module.hh;h=f4483ed2d9704487630aec23c78ed32fd67226da;hb=5e14d063f5098df2977dfb5fc9cadd281f800958;hp=17595408a71965ab102578136fa83c63d10a600c;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh index 17595408a7..f4483ed2d9 100644 --- a/lily/include/ly-module.hh +++ b/lily/include/ly-module.hh @@ -1,31 +1,44 @@ /* - ly-module.hh -- declare module related helper functions + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2002--2011 Han-Wen Nienhuys - (c) 2002--2007 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #ifndef LY_MODULE_HH #define LY_MODULE_HH +#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_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); 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); -/* Ugh signature of scm_internal_hash_fold () is inaccurate. */ -typedef SCM (*Hash_closure_function) (GUILE_ELLIPSIS); +/* 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 */