From 8afcbbef6781f494cf04e7a1928f7dd96b394bbb Mon Sep 17 00:00:00 2001 From: Abdulaziz Ghuloum Date: Fri, 31 Oct 2008 16:55:43 -0400 Subject: [PATCH] - fixed function cast in ikarus-ffi. - added "make check" rule in the scheme directory. --- scheme/Makefile.am | 2 ++ scheme/Makefile.in | 3 +++ scheme/last-revision | 2 +- src/ikarus-ffi.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scheme/Makefile.am b/scheme/Makefile.am index 1cfcb95..e7fa6c3 100644 --- a/scheme/Makefile.am +++ b/scheme/Makefile.am @@ -52,3 +52,5 @@ MAINTAINERCLEANFILES=last-revision ikarus.boot: $(EXTRA_DIST) ikarus.config.ss ../src/ikarus -b ./ikarus.boot.$(sizeofvoidp).prebuilt --r6rs-script makefile.ss +check: ikarus.boot + ../src/ikarus -b ikarus.boot --r6rs-script run-tests.ss diff --git a/scheme/Makefile.in b/scheme/Makefile.in index d750d2a..e64a161 100644 --- a/scheme/Makefile.in +++ b/scheme/Makefile.in @@ -386,6 +386,9 @@ ikarus.config.ss: Makefile last-revision ../config.h ikarus.boot: $(EXTRA_DIST) ikarus.config.ss ../src/ikarus -b ./ikarus.boot.$(sizeofvoidp).prebuilt --r6rs-script makefile.ss + +check: ikarus.boot + ../src/ikarus -b ikarus.boot --r6rs-script run-tests.ss # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/scheme/last-revision b/scheme/last-revision index 12ef667..9d354c7 100644 --- a/scheme/last-revision +++ b/scheme/last-revision @@ -1 +1 @@ -1654 +1655 diff --git a/src/ikarus-ffi.c b/src/ikarus-ffi.c index 097bd26..0f69769 100644 --- a/src/ikarus-ffi.c +++ b/src/ikarus-ffi.c @@ -322,7 +322,7 @@ ikrt_ffi_call(ikptr data, ikptr argsvec, ikpcb* pcb) { ikptr typevec = ref(data, off_vector_data + 2 * wordsize); ikptr rtype = ref(data, off_vector_data + 3 * wordsize); ffi_cif* cif = (ffi_cif*) ref(cifptr, off_pointer_data); - void(*fn)() = (void*) ref(funptr, off_pointer_data); + void(*fn)() = (void (*)()) ref(funptr, off_pointer_data); int n = unfix(ref(argsvec, off_vector_length)); void** avalues = alloc(sizeof(void*), n+1); int i;