From 53b3096a1edc7e0ff6c1ddb4a3fb00942e3249fc Mon Sep 17 00:00:00 2001 From: eknauel Date: Wed, 11 Feb 2004 12:44:06 +0000 Subject: [PATCH] + don't use preprocessor symbol inside quotes + get rid of FIXED_S48_CHECK_RECORD_TYPE --- ffi-tools/ffi-tools.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ffi-tools/ffi-tools.h b/ffi-tools/ffi-tools.h index bf1b21c..c4e5bfb 100644 --- a/ffi-tools/ffi-tools.h +++ b/ffi-tools/ffi-tools.h @@ -1,9 +1,6 @@ #include #include "scheme48.h" -/* kludges */ -#define FIXED_S48_RECORD_TYPE(x) (s48_stob_ref((x), S48_STOBTYPE_RECORD, 0)) - /* variables */ static s48_value scheme_list_length_function = S48_FALSE; static s48_value scheme_boolean_p_function = S48_FALSE; @@ -35,11 +32,11 @@ void ffit_init_hook(void); #define FFIT_RECORD_TYPE_INIT(C_RECTYPE, SCM_NAME) \ S48_GC_PROTECT_GLOBAL(C_RECTYPE); \ - C_RECTYPE = s48_get_imported_binding("SCM_NAME"); + C_RECTYPE = s48_get_imported_binding(SCM_NAME); #define FFIT_CHECK_RECORD_TYPE(SCM_VAL, SCM_RECTYPE) \ if (!(S48_RECORD_P(SCM_VAL) && \ - (FIXED_S48_RECORD_TYPE(SCM_VAL) == SCM_RECTYPE))) \ + (S48_RECORD_TYPE(SCM_VAL) == SCM_RECTYPE))) \ s48_raise_argument_type_error(SCM_VAL) #define FFIT_STRUCT_GET(FUNNAME, SCM_RECTYPE, C_RECTYPE, C_FIELD, FIELD_SCM_ENTER_FUN) \