diff --git a/libguile/deprecated.h b/libguile/deprecated.h index 0c0f6e56b..43c31d8c5 100644 --- a/libguile/deprecated.h +++ b/libguile/deprecated.h @@ -20,6 +20,7 @@ */ #include "libguile/__scm.h" +#include "libguile/snarf.h" #if (SCM_ENABLE_DEPRECATED == 1) @@ -42,6 +43,17 @@ v, pos, FUNC_NAME); \ } while (0) +#ifdef SCM_SUPPORT_STATIC_ALLOCATION +#define SCM_STATIC_DOUBLE_CELL(c_name, car, cbr, ccr, cdr) \ + static SCM_ALIGNED (8) SCM_UNUSED scm_t_cell \ + c_name ## _raw_cell [2] = \ + { \ + { SCM_PACK (car), SCM_PACK (cbr) }, \ + { SCM_PACK (ccr), SCM_PACK (cdr) } \ + }; \ + static SCM_UNUSED SCM c_name = SCM_PACK (& c_name ## _raw_cell) +#endif /* SCM_SUPPORT_STATIC_ALLOCATION */ + #define scm_gc_running_p 0 void scm_i_init_deprecated (void); diff --git a/libguile/snarf.h b/libguile/snarf.h index 836067b64..8bafcf538 100644 --- a/libguile/snarf.h +++ b/libguile/snarf.h @@ -196,15 +196,6 @@ SCM_SNARF_INIT(scm_set_smob_apply((tag), (c_name), (req), (opt), (rest));) }; \ static SCM_UNUSED const SCM c_name = SCM_PACK (& c_name ## _raw_cell) -#define SCM_STATIC_DOUBLE_CELL(c_name, car, cbr, ccr, cdr) \ - static SCM_ALIGNED (8) SCM_UNUSED scm_t_cell \ - c_name ## _raw_cell [2] = \ - { \ - { SCM_PACK (car), SCM_PACK (cbr) }, \ - { SCM_PACK (ccr), SCM_PACK (cdr) } \ - }; \ - static SCM_UNUSED SCM c_name = SCM_PACK (& c_name ## _raw_cell) - #define SCM_IMMUTABLE_STRINGBUF(c_name, contents) \ static SCM_UNUSED const \ struct \