--- gforth/libffi.fs	2008/06/17 20:18:11	1.22
+++ gforth/libffi.fs	2008/08/05 09:17:06	1.27
@@ -1,6 +1,6 @@
 \ libffi.fs	shared library support package 		14aug05py
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006,2007 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006,2007,2008 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -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;
@@ -337,6 +344,7 @@ also c-decl definitions
 ' >dl+ ' >dl-   6 argtype dlong
 ' >sf+ ' >sf-   9 argtype sf
 ' >df+ ' >df- &10 argtype df
+: ints 0 ?DO int LOOP ;
 
 ' noop   0 rettype (void)
 ' is>x   6 rettype (int)
@@ -424,6 +432,7 @@ also cb-decl definitions
 ' ffi-arg-longlong   8 argtype' llong
 ' ffi-arg-dlong      6 argtype' dlong
 ' ffi-arg-ptr      &12 argtype' ptr
+: ints ( n -- ) 0 ?DO postpone int LOOP ; immediate
 
 ' ffi-ret-void       0 rettype' (void)
 ' ffi-ret-int        6 rettype' (int)