diff options
Diffstat (limited to 'libguile/smob.h')
-rw-r--r-- | libguile/smob.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libguile/smob.h b/libguile/smob.h index 60abe3733..37ea64247 100644 --- a/libguile/smob.h +++ b/libguile/smob.h @@ -40,8 +40,7 @@ typedef struct scm_smob_descriptor int (*print) (SCM exp, SCM port, scm_print_state *pstate); SCM (*equalp) (SCM, SCM); scm_t_subr apply; - /* In 2.2 this field is renamed to "apply_trampoline". */ - SCM apply_trampoline_objcode; + SCM apply_trampoline; } scm_smob_descriptor; @@ -51,7 +50,7 @@ typedef struct scm_smob_descriptor #define SCM_SMOBNUM(x) (SCM_TC2SMOBNUM (SCM_CELL_TYPE (x))) /* SCM_SMOBNAME can be 0 if name is missing */ #define SCM_SMOBNAME(smobnum) (scm_smobs[smobnum].name) -#define SCM_SMOB_PREDICATE(tag, obj) SCM_TYP16_PREDICATE (tag, obj) +#define SCM_SMOB_PREDICATE(tag, obj) SCM_HAS_TYP16 (obj, tag) #define SCM_SMOB_DESCRIPTOR(x) (scm_smobs[SCM_SMOBNUM (x)]) #define SCM_SMOB_APPLICABLE_P(x) (SCM_SMOB_DESCRIPTOR (x).apply) @@ -73,14 +72,6 @@ SCM_INLINE SCM scm_new_smob (scm_t_bits tc, scm_t_bits); SCM_INLINE SCM scm_new_double_smob (scm_t_bits tc, scm_t_bits, scm_t_bits, scm_t_bits); -/* These two are internal details of the previous implementation of - SCM_NEWSMOB and are no longer used. They are still here to preserve - ABI stability in the 2.0 series. */ -SCM_API void scm_i_finalize_smob (void *ptr, void *data); -SCM_API SCM scm_i_new_smob_with_mark_proc (scm_t_bits tc, scm_t_bits, - scm_t_bits, scm_t_bits); - - #if SCM_CAN_INLINE || defined SCM_INLINE_C_IMPLEMENTING_INLINES SCM_INLINE_IMPLEMENTATION SCM scm_new_smob (scm_t_bits tc, scm_t_bits data) |