extra/tokyo: remove bool typedef, and rename time_t to tokyo_time_t to not clash...

diff --git a/extra/tokyo/alien/tcbdb/tcbdb.factor b/extra/tokyo/alien/tcbdb/tcbdb.factor
old mode 100644 (file)
new mode 100755 (executable)
index 730423c..8739e04
--- a/extra/tokyo/alien/tcbdb/tcbdb.factor
+++ b/extra/tokyo/alien/tcbdb/tcbdb.factor
@@ -116,7 +116,7 @@ FUNCTION: ulonglong tcbdbbnum ( TCBDB* bdb ) ;
 FUNCTION: uint tcbdbalign ( TCBDB* bdb ) ;
 FUNCTION: uint tcbdbfbpmax ( TCBDB* bdb ) ;
 FUNCTION: ulonglong tcbdbinode ( TCBDB* bdb ) ;
-FUNCTION: time_t tcbdbmtime ( TCBDB* bdb ) ;
+FUNCTION: tokyo_time_t tcbdbmtime ( TCBDB* bdb ) ;
 FUNCTION: uchar tcbdbflags ( TCBDB* bdb ) ;
 FUNCTION: uchar tcbdbopts ( TCBDB* bdb ) ;
 FUNCTION: char* tcbdbopaque ( TCBDB* bdb ) ;

diff --git a/extra/tokyo/alien/tcfdb/tcfdb.factor b/extra/tokyo/alien/tcfdb/tcfdb.factor
old mode 100644 (file)
new mode 100755 (executable)
index c624f86..91400aa
--- a/extra/tokyo/alien/tcfdb/tcfdb.factor
+++ b/extra/tokyo/alien/tcfdb/tcfdb.factor
@@ -84,7 +84,7 @@ FUNCTION: uint tcfdbwidth ( TCFDB* fdb ) ;
 FUNCTION: ulonglong tcfdblimsiz ( TCFDB* fdb ) ;
 FUNCTION: ulonglong tcfdblimid ( TCFDB* fdb ) ;
 FUNCTION: ulonglong tcfdbinode ( TCFDB* fdb ) ;
-FUNCTION: time_t tcfdbmtime ( TCFDB* fdb ) ;
+FUNCTION: tokyo_time_t tcfdbmtime ( TCFDB* fdb ) ;
 FUNCTION: int tcfdbomode ( TCFDB* fdb ) ;
 FUNCTION: uchar tcfdbtype ( TCFDB* fdb ) ;
 FUNCTION: uchar tcfdbflags ( TCFDB* fdb ) ;

diff --git a/extra/tokyo/alien/tchdb/tchdb.factor b/extra/tokyo/alien/tchdb/tchdb.factor
old mode 100644 (file)
new mode 100755 (executable)
index f143e9b..3793846
--- a/extra/tokyo/alien/tchdb/tchdb.factor
+++ b/extra/tokyo/alien/tchdb/tchdb.factor
@@ -83,7 +83,7 @@ FUNCTION: uint tchdbalign ( TCHDB* hdb ) ;
 FUNCTION: uint tchdbfbpmax ( TCHDB* hdb ) ;
 FUNCTION: ulonglong tchdbxmsiz ( TCHDB* hdb ) ;
 FUNCTION: ulonglong tchdbinode ( TCHDB* hdb ) ;
-FUNCTION: time_t tchdbmtime ( TCHDB* hdb ) ;
+FUNCTION: tokyo_time_t tchdbmtime ( TCHDB* hdb ) ;
 FUNCTION: int tchdbomode ( TCHDB* hdb ) ;
 FUNCTION: uchar tchdbtype ( TCHDB* hdb ) ;
 FUNCTION: uchar tchdbflags ( TCHDB* hdb ) ;

diff --git a/extra/tokyo/alien/tcrdb/tcrdb.factor b/extra/tokyo/alien/tcrdb/tcrdb.factor
old mode 100644 (file)
new mode 100755 (executable)
index 5b7be38..3ff3bc6
--- a/extra/tokyo/alien/tcrdb/tcrdb.factor
+++ b/extra/tokyo/alien/tcrdb/tcrdb.factor
@@ -42,8 +42,6 @@ CONSTANT: RDBXOLCKGLB 2
 CONSTANT: RDBROCHKCON 1
 CONSTANT: RDBMONOULOG 1
 
-TYPEDEF: int bool
-
 FUNCTION: char* tcrdberrmsg ( int ecode ) ;
 FUNCTION: TCRDB* tcrdbnew ( ) ;
 FUNCTION: void tcrdbdel ( TCRDB* rdb ) ;

diff --git a/extra/tokyo/alien/tctdb/tctdb.factor b/extra/tokyo/alien/tctdb/tctdb.factor
old mode 100644 (file)
new mode 100755 (executable)
index 7bcb0f2..bb65acb
--- a/extra/tokyo/alien/tctdb/tctdb.factor
+++ b/extra/tokyo/alien/tctdb/tctdb.factor
@@ -136,7 +136,7 @@ FUNCTION: ulonglong tctdbbnum ( TCTDB* tdb ) ;
 FUNCTION: uint tctdbalign ( TCTDB* tdb ) ;
 FUNCTION: uint tctdbfbpmax ( TCTDB* tdb ) ;
 FUNCTION: ulonglong tctdbinode ( TCTDB* tdb ) ;
-FUNCTION: time_t tctdbmtime ( TCTDB* tdb ) ;
+FUNCTION: tokyo_time_t tctdbmtime ( TCTDB* tdb ) ;
 FUNCTION: uchar tctdbflags ( TCTDB* tdb ) ;
 FUNCTION: uchar tctdbopts ( TCTDB* tdb ) ;
 FUNCTION: char* tctdbopaque ( TCTDB* tdb ) ;

diff --git a/extra/tokyo/alien/tcutil/tcutil.factor b/extra/tokyo/alien/tcutil/tcutil.factor
old mode 100644 (file)
new mode 100755 (executable)
index 25df54d..ac6e242
--- a/extra/tokyo/alien/tcutil/tcutil.factor
+++ b/extra/tokyo/alien/tcutil/tcutil.factor
@@ -19,7 +19,7 @@ C-ENUM:
     TCDBTTABLE ;
 
 ! 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*
 
@@ -36,4 +36,4 @@ FUNCTION: void tcfree ( void* ptr ) ;
 TYPEDEF: void* TCCMP
 TYPEDEF: void* TCCODEC
 TYPEDEF: void* TCPDPROC
-TYPEDEF: voud* TCITER
+TYPEDEF: void* TCITER