From ab151e9c55f078a2f855027350f128eab266eb8b Mon Sep 17 00:00:00 2001 From: Juan Jose Garcia Ripoll Date: Sat, 27 Aug 2011 19:30:59 +0200 Subject: [PATCH] Symbol FREE-FFI-CLOSURE should only be defined when using LIBFFI --- src/c/symbols_list.h | 7 ++++++- src/c/symbols_list2.h | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h index e87eb2a23..aa6faa491 100755 --- a/src/c/symbols_list.h +++ b/src/c/symbols_list.h @@ -76,6 +76,11 @@ typedef struct { #else # define IF_DFFI(x) NULL #endif +#if defined(HAVE_LIBFFI) +# define IF_LIBFFI(x) x +#else +# define IF_LIBFFI(x) NULL +#endif cl_symbol_initializer cl_symbols[] = { @@ -1718,7 +1723,7 @@ cl_symbols[] = { {SYS_ "CALL-CFUN", SI_ORDINARY, IF_DFFI(si_call_cfun), -1, OBJNULL}, {KEY_ "CALLBACK", KEYWORD, NULL, -1, OBJNULL}, {SYS_ "MAKE-DYNAMIC-CALLBACK", SI_ORDINARY, IF_DFFI(si_make_dynamic_callback), -1, OBJNULL}, -{SYS_ "FREE-FFI-CLOSURE", SI_ORDINARY, IF_DFFI(si_free_ffi_closure), 1, OBJNULL}, +{SYS_ "FREE-FFI-CLOSURE", SI_ORDINARY, IF_LIBFFI(si_free_ffi_closure), 1, OBJNULL}, /* #endif defined(HAVE_LIBFFI) || defined(ECL_DYNAMIC_FFI) */ {KEY_ "CDECL", KEYWORD, NULL, -1, OBJNULL}, {KEY_ "STDCALL", KEYWORD, NULL, -1, OBJNULL}, diff --git a/src/c/symbols_list2.h b/src/c/symbols_list2.h index 3f35da0b4..89d269a75 100644 --- a/src/c/symbols_list2.h +++ b/src/c/symbols_list2.h @@ -76,6 +76,11 @@ typedef struct { #else # define IF_DFFI(x) NULL #endif +#if defined(HAVE_LIBFFI) +# define IF_LIBFFI(x) x +#else +# define IF_LIBFFI(x) NULL +#endif cl_symbol_initializer cl_symbols[] = { @@ -1718,7 +1723,7 @@ cl_symbols[] = { {SYS_ "CALL-CFUN",IF_DFFI("si_call_cfun")}, {KEY_ "CALLBACK",NULL}, {SYS_ "MAKE-DYNAMIC-CALLBACK",IF_DFFI("si_make_dynamic_callback")}, -{SYS_ "FREE-FFI-CLOSURE",IF_DFFI("si_free_ffi_closure")}, +{SYS_ "FREE-FFI-CLOSURE",IF_LIBFFI("si_free_ffi_closure")}, /* #endif defined(HAVE_LIBFFI) || defined(ECL_DYNAMIC_FFI) */ {KEY_ "CDECL",NULL}, {KEY_ "STDCALL",NULL},