--- gforth/libffi.fs	2008/06/17 20:18:11	1.22
+++ gforth/libffi.fs	2008/07/13 19:20:54	1.24
@@ -21,14 +21,21 @@
 \ note that the API functions have their arguments reversed and other
 \ deviations.
 
-require libcc.fs
-
 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;