--- gforth/libffi.fs	2008/06/01 12:18:56	1.21
+++ gforth/libffi.fs	2008/07/03 12:29:04	1.23
@@ -23,11 +23,21 @@
 
 require libcc.fs
 
-clear-libs s" ffi" add-lib
+c-library libffi
+s" ffi" add-lib
 
-\c #include <ffi.h>
-\c static Cell *gforth_RP;
-\c static unsigned 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;
@@ -142,6 +152,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