--- gforth/fflib.fs	2005/12/11 21:58:20	1.12
+++ gforth/fflib.fs	2007/12/31 17:34:58	1.17
@@ -1,6 +1,6 @@
 \ lib.fs	shared library support package 		16aug03py
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2006,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -80,13 +80,20 @@ Variable ind-call ind-call off
 DOES> ( -- )  dup thislib ! proc: ;
 
 : init-shared-libs ( -- )
-    defers 'cold  libs
-    0  libs  BEGIN  @ dup  WHILE  dup  REPEAT  drop
-    BEGIN  dup  WHILE  >r
-	r@ @lib
-	r@ 2 cells +  BEGIN  @ dup  WHILE  r@ over @proc  REPEAT
-	drop rdrop
-    REPEAT  drop ;
+    defers 'cold
+    0  libs  BEGIN
+	@ dup WHILE
+	    dup  REPEAT
+    drop BEGIN
+	dup  WHILE
+	    >r
+	    r@ @lib
+	    r@ 2 cells +  BEGIN
+		@ dup  WHILE
+		    r@ over @proc  REPEAT
+	    drop rdrop
+    REPEAT
+    drop ;
 
 ' init-shared-libs IS 'cold
 
@@ -127,14 +134,14 @@ also c-decl definitions
 ' av-int      ' av-int-r      ' >r  argtype int
 ' av-float    ' av-float-r    ' f>l argtype sf
 ' av-double   ' av-double-r   ' f>l argtype df
-' av-longlong ' av-longlong-r ' 2>r argtype llong
+' av-longlong ' av-longlong-r ' 2>r argtype dlong
 ' av-ptr      ' av-ptr-r      ' >r  argtype ptr
 
 ' av-call-void     ' av-start-void     rettype (void)
 ' av-call-int      ' av-start-int      rettype (int)
 ' av-call-float    ' av-start-float    rettype (sf)
 ' av-call-double   ' av-start-double   rettype (fp)
-' av-call-longlong ' av-start-longlong rettype (llong)
+' av-call-longlong ' av-start-longlong rettype (dlong)
 ' av-call-ptr      ' av-start-ptr      rettype (ptr)
 
 : (addr)  postpone EXIT drop symbol, previous revarg off ;
@@ -196,14 +203,14 @@ also cb-decl definitions
 ' va-arg-int      Alias int
 ' va-arg-float    Alias sf
 ' va-arg-double   Alias df
-' va-arg-longlong Alias llong
+' va-arg-longlong Alias dlong
 ' va-arg-ptr      Alias ptr
 
 ' va-return-void     ' va-start-void     va-ret (void)
 ' va-return-int      ' va-start-int      va-ret (int)
 ' va-return-float    ' va-start-float    va-ret (sf)
 ' va-return-double   ' va-start-double   va-ret (fp)
-' va-return-longlong ' va-start-longlong va-ret (llong)
+' va-return-longlong ' va-start-longlong va-ret (dlong)
 ' va-return-ptr      ' va-start-ptr      va-ret (ptr)
 
 previous definitions