update libc to use FUNCTION: and FUNCTION-ALIAS:

diff --git a/basis/libc/libc.factor b/basis/libc/libc.factor
index 27d7555d6734e0ef024080b264b3acb8b79cef66..5495ec27051ba7fd8b4265c7201756e4c5e039ce 100644 (file)
--- a/basis/libc/libc.factor
+++ b/basis/libc/libc.factor
@@ -2,15 +2,18 @@
 ! Copyright (C) 2007, 2010 Slava Pestov
 ! Copyright (C) 2007, 2008 Doug Coleman
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types assocs continuations alien.destructors kernel
-namespaces accessors sets summary destructors destructors.private ;
+USING: alien alien.c-types alien.syntax assocs continuations
+alien.destructors kernel namespaces accessors sets summary
+destructors destructors.private ;
 IN: libc
 
-: errno ( -- int )
-    int "factor" "err_no" { } alien-invoke ;
+LIBRARY: factor
 
-: set-errno ( int -- )
-    void "factor" "set_err_no" { int } alien-invoke ;
+FUNCTION-ALIAS: errno
+    int err_no ( ) ;
+
+FUNCTION-ALIAS: set-errno
+    void set_err_no ( int err-no ) ;
 
 : clear-errno ( -- )
     0 set-errno ;
@@ -18,17 +21,19 @@ IN: libc
 : preserve-errno ( quot -- )
     errno [ call ] dip set-errno ; inline
 
-: (malloc) ( size -- alien )
-    void* "libc" "malloc" { ulong } alien-invoke ;
+LIBRARY: libc
+
+FUNCTION-ALIAS: (malloc)
+    void* malloc ( ulong size ) ;
 
-: (calloc) ( count size -- alien )
-    void* "libc" "calloc" { ulong ulong } alien-invoke ;
+FUNCTION-ALIAS: (calloc)
+    void* calloc ( ulong count,  ulong size ) ;
 
-: (free) ( alien -- )
-    void "libc" "free" { void* } alien-invoke ;
+FUNCTION-ALIAS: (free)
+    void free ( void* alien ) ;
 
-: (realloc) ( alien size -- newalien )
-    void* "libc" "realloc" { void* ulong } alien-invoke ;
+FUNCTION-ALIAS: (realloc)
+    void* realloc ( void* alien, ulong size ) ;
 
 <PRIVATE
 
@@ -86,17 +91,14 @@ PRIVATE>
 : free ( alien -- )
     >c-ptr [ delete-malloc ] [ (free) ] bi ;
 
-: memcpy ( dst src size -- )
-    void "libc" "memcpy" { void* void* ulong } alien-invoke ;
+FUNCTION: void memcpy ( void* dst, void* src, ulong size ) ;
 
-: memcmp ( a b size -- cmp )
-    int "libc" "memcmp" { void* void* ulong } alien-invoke ;
+FUNCTION: int memcmp ( void* a, void* b, ulong size ) ;
 
 : memory= ( a b size -- ? )
     memcmp 0 = ;
 
-: strlen ( alien -- len )
-    size_t "libc" "strlen" { c-string } alien-invoke ;
+FUNCTION: size_t strlen ( c-string alien ) ;
 
 DESTRUCTOR: free
 DESTRUCTOR: (free)