--- gforth/libffi.fs	2008/04/19 19:15:14	1.18
+++ gforth/libffi.fs	2008/07/13 19:20:54	1.24
@@ -21,25 +21,32 @@
 \ note that the API functions have their arguments reversed and other
 \ deviations.
 
-require libcc.fs
+c-library libffi
+s" ffi" add-lib
 
-s" libffi.so" open-lib 0= [if]
-    .( cannot open libffi ) cr abort
-[then]
-
-\c #include <ffi.h>
-\c static Cell *gforth_RP;
-\c static char *gforth_LP;
+s" os-type" environment? [IF] s" darwin" string-prefix?
+[IF]
+    \c #define MACOSX
+    \c #include <ffi/ffi.h>
+[ELSE]
+    \c #include <ffi.h>
+[THEN]
+[ELSE]
+    \c #include <ffi.h>
+[THEN]
+\c extern Cell *gforth_RP;
+\c extern unsigned char *gforth_LP;
 \c static void **gforth_clist;
 \c static void *gforth_ritem;
 \c typedef void *Label;
 \c typedef Label *Xt;
+\c Label *gforth_engine(Xt *ip, Cell *sp, Cell *rp0, Float *fp, unsigned char *lp);
 \c static void gforth_callback_ffi(ffi_cif * cif, void * resp, void ** args, void * ip)
 \c {
 \c   Cell *rp1 = gforth_RP;
 \c   Cell *sp = gforth_SP;
 \c   Float *fp = gforth_FP;
-\c   char *lp = gforth_LP;
+\c   unsigned char *lp = gforth_LP;
 \c   void ** clist = gforth_clist;
 \c   void * ritem = gforth_ritem;
 \c 
@@ -84,7 +91,7 @@ c-function ffi-call ffi_call1 a a a a --
 
 \c #define ffi_prep_closure1(a_ip, a_cif, a_closure) \
 \c              ffi_prep_closure((ffi_closure *)a_closure, (ffi_cif *)a_cif, gforth_callback_ffi, (void *)a_ip)
-c-function ffi-prep-closure a a a -- n
+c-function ffi-prep-closure ffi_prep_closure1 a a a -- n
 
 \ !! use ud?
 \c #define ffi_2fetch(a_addr) (*(long long *)a_addr)
@@ -143,6 +150,7 @@ c-function ffi-ret-float1 ffi_ret_float1
 \c #define ffi_ret_double1(r) (*(double *)(gforth_ritem) = r)
 c-function ffi-ret-double1 ffi_ret_double1 r -- void
 : ffi-ret-double ( r -- ) ffi-ret-double1 ffi-ret-void ;
+end-c-library
 
 \ common stuff, same as fflib.fs