X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-guile.hh;h=6b13fc9eb8f491fafae72875a6c3621485d17a19;hb=38655bc28e73a0b218ba1582bdb84bab0fdfec4b;hp=7fb9c8025ba51f469f6c2a140e7a2e1ec50c0984;hpb=17912cfaa97a8c3159026435db295c055a977270;p=lilypond.git diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 7fb9c8025b..6b13fc9eb8 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -23,6 +23,7 @@ #include "config.h" #include "drul-array.hh" + /* Guile 1.3.4 compatibility */ #if GUILE_MINOR_VERSION < 4 @@ -69,7 +70,6 @@ #endif - #include "direction.hh" #include "flower-proto.hh" @@ -168,7 +168,12 @@ inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val) { return scm_acons(key, val, scm_assoc_remove_x (alist, key)); } +#ifdef PARANOID +#define gh_pair_p ly_pair_p +bool ly_pair_p (SCM x); +#else inline bool ly_pair_p (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); } +#endif inline bool ly_symbol_p (SCM x) { return SCM_SYMBOLP (x); } inline bool ly_number_p (SCM x) { return SCM_NUMBERP (x); } inline bool ly_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p(x)); }