--- gforth/lib.fs	2005/11/20 23:15:42	1.11
+++ gforth/lib.fs	2007/06/30 23:00:35	1.20
@@ -1,6 +1,6 @@
 \ lib.fs	shared library support package 		11may97py
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -24,18 +24,39 @@
     [IFDEF] ffi-call
 	include libffi.fs
     [ELSE]
+        .( Neither libffi nor ffcall are available ) cr
+        abort
+        .( Using oldlib.fs; incompatible with fflib.fs and libffi.fs) cr
 	include oldlib.fs
     [THEN]
 [THEN]
 
 \ testing stuff
 
+[IFUNDEF] libc
+    s" os-type" environment? [IF]
+	2dup s" linux-gnu" str= [IF]  2drop
+	    library libc libc.so.6
+	[ELSE] 2dup s" cygwin" str= [IF]  2drop
+		library libc cygwin1.dll
+	    [ELSE]  2dup s" bsd" search nip nip [IF]  2drop
+		    library libc libc.so
+		[ELSE]  2dup s" darwin" string-prefix? [IF]  2drop
+			library libc libc.dylib
+		    [ELSE]  2drop \ or add your stuff here
+		    [THEN]
+		[THEN]
+	    [THEN]
+	[THEN]
+    [THEN]
+[THEN]
+
 [ifdef] testing
 
 library libc libc.so.6
                 
 libc sleep int (int) sleep
-libc open  int int ptr (int) open
+libc open  ptr int int (int) open
 libc lseek int llong int (llong) lseek64
 libc read  int ptr int (int) read
 libc close int (int) close
@@ -61,7 +82,9 @@ callback 2:1 (int) int int callback;
     cr ." result " + .s cr ;
 ' cb-test 2:1 c_plus
 
-: test  c_plus av-start-int >r >r av-int-r av-int-r av-call-int ;
+fptr 2:1call int int (int)
+
+: test  c_plus 2:1call ;
 
 \ 3 4 test