factor: trim using lists

[factor.git] / extra / tokyo / alien / tcutil / tcutil.factor

diff --git a/extra/tokyo/alien/tcutil/tcutil.factor b/extra/tokyo/alien/tcutil/tcutil.factor
index 25df54d0133973960f3cfbc76ddd5cfb5f1af403..39e9b48d67d9a2e889ab21c0261fe9f08255e2c3 100644 (file)
--- a/extra/tokyo/alien/tcutil/tcutil.factor
+++ b/extra/tokyo/alien/tcutil/tcutil.factor
@@ -1,39 +1,38 @@
 ! Copyright (C) 2009 Bruno Deferrari
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.libraries alien.syntax
-combinators kernel system ;
+combinators system ;
 IN: tokyo.alien.tcutil
 
 << "tokyocabinet" {
-    { [ os macosx? ] [ "/opt/local/lib/libtokyocabinet.dylib" ] }
+    { [ os macosx? ] [ "libtokyocabinet.dylib" ] }
     { [ os unix? ] [ "libtokyocabinet.so" ] }
     { [ os windows? ] [ "tokyocabinet.dll" ] }
-} cond "cdecl" add-library >>
+} cond cdecl add-library >>
 
 LIBRARY: tokyocabinet
 
-C-ENUM:
-    TCDBTHASH
-    TCDBTBTREE
-    TCDBTFIXED
-    TCDBTTABLE ;
+CONSTANT: TCDBTHASH 0
+CONSTANT: TCDBTBTREE 1
+CONSTANT: TCDBTFIXED 2
+CONSTANT: TCDBTTABLE 3
 
 ! FIXME: on windows 64bits this isn't correct, because long is 32bits there, and time_t is int64
-TYPEDEF: long time_t
+TYPEDEF: long tokyo_time_t
 
-TYPEDEF: void* TCLIST*
+C-TYPE: TCLIST
 
-FUNCTION: TCLIST* tclistnew ( ) ;
-FUNCTION: TCLIST* tclistnew2 ( int anum ) ;
-FUNCTION: void tclistdel ( TCLIST* list ) ;
-FUNCTION: int tclistnum ( TCLIST* list ) ;
-FUNCTION: void* tclistval ( TCLIST* list, int index, int* sp ) ;
-FUNCTION: char* tclistval2 ( TCLIST* list, int index ) ;
-FUNCTION: void tclistpush ( TCLIST* list, void* ptr, int size ) ;
-FUNCTION: void tclistpush2 ( TCLIST* list, char* str ) ;
-FUNCTION: void tcfree ( void* ptr ) ;
+FUNCTION: TCLIST* tclistnew ( )
+FUNCTION: TCLIST* tclistnew2 ( int anum )
+FUNCTION: void tclistdel ( TCLIST* list )
+FUNCTION: int tclistnum ( TCLIST* list )
+FUNCTION: void* tclistval ( TCLIST* list, int index, int* sp )
+FUNCTION: c-string tclistval2 ( TCLIST* list, int index )
+FUNCTION: void tclistpush ( TCLIST* list, void* ptr, int size )
+FUNCTION: void tclistpush2 ( TCLIST* list, c-string str )
+FUNCTION: void tcfree ( void* ptr )
 
 TYPEDEF: void* TCCMP
 TYPEDEF: void* TCCODEC
 TYPEDEF: void* TCPDPROC
-TYPEDEF: voud* TCITER
+TYPEDEF: void* TCITER