From: David Kastrup Date: Fri, 26 Jun 2015 21:53:35 +0000 (+0200) Subject: Issue 4464/1: Move ly_is_module from ly-module.hh to lily-guile.hh X-Git-Tag: release/2.19.23-1~39 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=36ef4db248fa2b48a9821ec55531d4a12f6b97db;p=lilypond.git Issue 4464/1: Move ly_is_module from ly-module.hh to lily-guile.hh --- diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index b7cfabd675..76919a5d9d 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -100,6 +100,7 @@ SCM ly_assoc_prepend_x (SCM alist, SCM key, SCM val); inline bool ly_is_list (SCM x) { return scm_is_true (scm_list_p (x)); } inline bool ly_cheap_is_list (SCM x) { return scm_is_pair (x) || scm_is_null (x); } +inline bool ly_is_module (SCM x) { return SCM_MODULEP (x); } inline bool ly_is_procedure (SCM x) { return scm_is_true (scm_procedure_p (x)); } inline bool ly_is_port (SCM x) { return scm_is_true (scm_port_p (x)); } diff --git a/lily/include/ly-module.hh b/lily/include/ly-module.hh index e763138ef8..82a147a4b4 100644 --- a/lily/include/ly-module.hh +++ b/lily/include/ly-module.hh @@ -29,8 +29,6 @@ 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_use_module (SCM mod, SCM used); /* For backward compatability with Guile 1.8 */