take a shot at making other platform vocabs c-type-string-free

diff --git a/basis/math/floats/env/ppc/ppc.factor b/basis/math/floats/env/ppc/ppc.factor
index d6a6ae6834c74b244a52f84b0f763832e8ccf7d0..f635a2a0f1e2959e3d5157feeb1173d07e9d077b 100644 (file)
--- a/basis/math/floats/env/ppc/ppc.factor
+++ b/basis/math/floats/env/ppc/ppc.factor
@@ -1,6 +1,6 @@
-USING: accessors alien.syntax arrays assocs biassocs
-classes.struct combinators kernel literals math math.bitwise
-math.floats.env math.floats.env.private system ;
+USING: accessors alien.c-types alien.syntax arrays assocs
+biassocs classes.struct combinators kernel literals math
+math.bitwise math.floats.env math.floats.env.private system ;
 IN: math.floats.env.ppc
 
 STRUCT: ppc-fpu-env

diff --git a/basis/unix/getfsstat/freebsd/freebsd.factor b/basis/unix/getfsstat/freebsd/freebsd.factor
index 44d85680a715fd4e35412013f48d2cbbb41877d2..fefd316fdbe3979ec8ad95eeaba9f34f338a9857 100644 (file)
--- a/basis/unix/getfsstat/freebsd/freebsd.factor
+++ b/basis/unix/getfsstat/freebsd/freebsd.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax ;
+USING: alien.c-types alien.syntax unix.statfs.freebsd ;
 IN: unix.getfsstat.freebsd
 
 CONSTANT: MNT_WAIT        1       ! synchronously wait for I/O to complete

diff --git a/basis/unix/getfsstat/netbsd/netbsd.factor b/basis/unix/getfsstat/netbsd/netbsd.factor
index 1eca6d7dc391081e412fba43db800e520168ab6f..cdad20e4b52af74d4522f4e7e91e0fbd4f5d67df 100644 (file)
--- a/basis/unix/getfsstat/netbsd/netbsd.factor
+++ b/basis/unix/getfsstat/netbsd/netbsd.factor
@@ -1,10 +1,10 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax ;
+USING: alien.c-types alien.syntax unix.statvfs.netbsd ;
 IN: unix.getfsstat.netbsd
 
 CONSTANT: MNT_WAIT   1 ! synchronously wait for I/O to complete
 CONSTANT: MNT_NOWAIT 2 ! start all I/O, but do not wait for it 
 CONSTANT: MNT_LAZY   3 ! push data not written by filesystem syncer 
 
-FUNCTION: int getvfsstat ( statfs* buf, int bufsize, int flags ) ;
+FUNCTION: int getvfsstat ( statvfs* buf, int bufsize, int flags ) ;

diff --git a/basis/unix/getfsstat/openbsd/openbsd.factor b/basis/unix/getfsstat/openbsd/openbsd.factor
index 19465d8040163738e65cb82835e4809d79901f9b..07b45f5df5e2c3c89aaf013aa524c38fe2463dc6 100644 (file)
--- a/basis/unix/getfsstat/openbsd/openbsd.factor
+++ b/basis/unix/getfsstat/openbsd/openbsd.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax ;
+USING: alien.c-types alien.syntax unix.statfs.openbsd ;
 IN: unix.getfsstat.openbsd
 
 CONSTANT: MNT_WAIT   1 ! synchronously wait for I/O to complete

diff --git a/basis/unix/kqueue/freebsd/freebsd.factor b/basis/unix/kqueue/freebsd/freebsd.factor
index 4bf5af84820a4460a54e28179c999a67be9e8c21..54f576ffc172d0b17cce1c4a794f5d2c31085bea 100644 (file)
--- a/basis/unix/kqueue/freebsd/freebsd.factor
+++ b/basis/unix/kqueue/freebsd/freebsd.factor
@@ -1,4 +1,4 @@
-USING: alien.syntax classes.struct ;
+USING: alien.c-types alien.syntax classes.struct unix.time ;
 IN: unix.kqueue
 
 STRUCT: kevent

diff --git a/basis/unix/kqueue/netbsd/netbsd.factor b/basis/unix/kqueue/netbsd/netbsd.factor
index d9a91169305689cc8b81e221859304956c592bf9..9ba620258538dbf330c43582529f49593f53852c 100644 (file)
--- a/basis/unix/kqueue/netbsd/netbsd.factor
+++ b/basis/unix/kqueue/netbsd/netbsd.factor
@@ -1,4 +1,4 @@
-USING: alien.syntax classes.struct ;
+USING: alien.c-types alien.syntax classes.struct unix.time ;
 IN: unix.kqueue
 
 STRUCT: kevent

diff --git a/basis/unix/kqueue/openbsd/openbsd.factor b/basis/unix/kqueue/openbsd/openbsd.factor
index 1d851c8d681d20aa6aa7e508a3d4babc87d311b1..ab680345b627da0f6af3ef86995863c2ff418183 100644 (file)
--- a/basis/unix/kqueue/openbsd/openbsd.factor
+++ b/basis/unix/kqueue/openbsd/openbsd.factor
@@ -1,4 +1,4 @@
-USING: alien.syntax classes.struct ;
+USING: alien.c-types alien.syntax classes.struct unix.time ;
 IN: unix.kqueue
 
 STRUCT: kevent

diff --git a/basis/unix/linux/linux.factor b/basis/unix/linux/linux.factor
index 48044c731c2ea3fc21d936c6b9cd8a208e3b38f0..1ff5401116591b45404cc8093a4c8f7f4acf74f1 100644 (file)
--- a/basis/unix/linux/linux.factor
+++ b/basis/unix/linux/linux.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax alien system classes.struct ;
+USING: alien.c-types alien.syntax alien system classes.struct ;
 IN: unix
 
 ! Linux.

diff --git a/basis/unix/solaris/solaris.factor b/basis/unix/solaris/solaris.factor
index b7ea3f172ed53ff173a2727543e8cc2fe637a372..1a1a7603f03d0208174cc5aba44837abc92c1e10 100644 (file)
--- a/basis/unix/solaris/solaris.factor
+++ b/basis/unix/solaris/solaris.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2006 Patrick Mauritz.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax system kernel layouts ;
+USING: alien.c-types alien.syntax system kernel layouts ;
 IN: unix
 
 ! Solaris.

diff --git a/basis/unix/stat/freebsd/freebsd.factor b/basis/unix/stat/freebsd/freebsd.factor
index 0acf2512e800c491f5ee09daec51b79f2a1ca2b7..04f884e496823ec083fcb3c4d493d5b973d2ea59 100644 (file)
--- a/basis/unix/stat/freebsd/freebsd.factor
+++ b/basis/unix/stat/freebsd/freebsd.factor
@@ -1,4 +1,5 @@
-USING: kernel alien.syntax math classes.struct ;
+USING: kernel alien.c-types alien.syntax math classes.struct
+unix.time unix.types ;
 IN: unix.stat
 
 ! FreeBSD 8.0-CURRENT

diff --git a/basis/unix/stat/linux/32/32.factor b/basis/unix/stat/linux/32/32.factor
index 324237d64557f252c5819c074f65a1b4009bb700..f01140ff4b2b6256ac8f5e46aab2d34c05fa2a19 100644 (file)
--- a/basis/unix/stat/linux/32/32.factor
+++ b/basis/unix/stat/linux/32/32.factor
@@ -1,4 +1,5 @@
-USING: kernel alien.syntax math classes.struct ;
+USING: kernel alien.c-types alien.syntax math classes.struct
+unix.time unix.types ;
 IN: unix.stat
 
 ! stat64

diff --git a/basis/unix/stat/linux/64/64.factor b/basis/unix/stat/linux/64/64.factor
index cfd6553ca3b96ca268d091c31e45fcac33d6604e..bb16133c76bba3a7b39199cda40739ccef639ab1 100644 (file)
--- a/basis/unix/stat/linux/64/64.factor
+++ b/basis/unix/stat/linux/64/64.factor
@@ -1,4 +1,5 @@
-USING: kernel alien.syntax math classes.struct ;
+USING: kernel alien.c-types alien.syntax math classes.struct
+unix.time unix.types ;
 IN: unix.stat
 
 ! Ubuntu 7.10 64-bit

diff --git a/basis/unix/stat/netbsd/32/32.factor b/basis/unix/stat/netbsd/32/32.factor
index 98403313b8728b5920814cb8aa8d5de11dac2e39..fb0d61b7e9efcbd3e10cd2de48ecd4c428acc517 100644 (file)
--- a/basis/unix/stat/netbsd/32/32.factor
+++ b/basis/unix/stat/netbsd/32/32.factor
@@ -1,4 +1,5 @@
-USING: kernel alien.syntax math classes.struct ;
+USING: kernel alien.c-types alien.syntax math classes.struct
+unix.time unix.types ;
 IN: unix.stat
 
 ! NetBSD 4.0

diff --git a/basis/unix/stat/netbsd/64/64.factor b/basis/unix/stat/netbsd/64/64.factor
index c532e7e9ff655484c3465c1c8609bb3070a3752f..47c4e0c129f58d3a8c0cae47b907b5976e3377a2 100644 (file)
--- a/basis/unix/stat/netbsd/64/64.factor
+++ b/basis/unix/stat/netbsd/64/64.factor
@@ -1,4 +1,5 @@
-USING: kernel alien.syntax math classes.struct ;
+USING: kernel alien.c-types alien.syntax math classes.struct
+unix.time unix.types ;
 IN: unix.stat
 
 ! NetBSD 4.0

diff --git a/basis/unix/stat/openbsd/openbsd.factor b/basis/unix/stat/openbsd/openbsd.factor
index 5bf950fd4b93d10f6516b657af8c6fffe17c4e1e..2702e60f6cdd21813ca36da9414304304901578d 100644 (file)
--- a/basis/unix/stat/openbsd/openbsd.factor
+++ b/basis/unix/stat/openbsd/openbsd.factor
@@ -1,4 +1,5 @@
-USING: kernel alien.syntax math classes.struct ;
+USING: kernel alien.c-types alien.syntax math classes.struct
+unix.time unix.types ;
 IN: unix.stat
 
 ! OpenBSD 4.2

diff --git a/basis/unix/statfs/freebsd/freebsd.factor b/basis/unix/statfs/freebsd/freebsd.factor
index f8c8257a4e9351d305b3ed02bd981ced537b8ab7..c9271ff00759e1cc1aa5f6890c7eee9188d9ac90 100644 (file)
--- a/basis/unix/statfs/freebsd/freebsd.factor
+++ b/basis/unix/statfs/freebsd/freebsd.factor
@@ -27,8 +27,8 @@ STRUCT: statfs
     { f_owner uid_t }
     { f_fsid fsid_t }
     { f_charspare char[80] }
-    { f_fstypename { "char" MFSNAMELEN } }
-    { f_mntfromname { "char" MNAMELEN } }
-    { f_mntonname { "char" MNAMELEN } } ;
+    { f_fstypename { char MFSNAMELEN } }
+    { f_mntfromname { char MNAMELEN } }
+    { f_mntonname { char MNAMELEN } } ;
 
 FUNCTION: int statfs ( char* path, statvfs* buf ) ;

diff --git a/basis/unix/statfs/linux/linux.factor b/basis/unix/statfs/linux/linux.factor
index 42d66ff1baad52095481696b2a2f39008e20e8d1..ab37ab9605970bd76a9cf1e5fff5df7dc30cf626 100644 (file)
--- a/basis/unix/statfs/linux/linux.factor
+++ b/basis/unix/statfs/linux/linux.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax unix.types unix.stat classes.struct ;
+USING: alien.c-types alien.syntax unix.types unix.stat classes.struct ;
 IN: unix.statfs.linux
 
 STRUCT: statfs64

diff --git a/basis/unix/statfs/macosx/macosx.factor b/basis/unix/statfs/macosx/macosx.factor
index 38709f64fe8ca4f18fd59b323b269ff807d09a1b..e83d2d40a03844f90b0c08e1353c4444c871e376 100644 (file)
--- a/basis/unix/statfs/macosx/macosx.factor
+++ b/basis/unix/statfs/macosx/macosx.factor
@@ -111,9 +111,9 @@ STRUCT: statfs64
     { f_type uint32_t }
     { f_flags uint32_t }
     { f_fssubtype uint32_t }
-    { f_fstypename { "char" MFSTYPENAMELEN } }
-    { f_mntonname { "char" MAXPATHLEN } }
-    { f_mntfromname { "char" MAXPATHLEN } }
+    { f_fstypename { char MFSTYPENAMELEN } }
+    { f_mntonname { char MAXPATHLEN } }
+    { f_mntfromname { char MAXPATHLEN } }
     { f_reserved uint32_t[8] } ;
 
 FUNCTION: int statfs64 ( char* path, statfs64* buf ) ;

diff --git a/basis/unix/statfs/openbsd/openbsd.factor b/basis/unix/statfs/openbsd/openbsd.factor
index 590faf82a636a83cf905c1ff7012d07c72a92d3c..cd720d74d41eb3eb6cc865ff9f51a14e9b8322fe 100644 (file)
--- a/basis/unix/statfs/openbsd/openbsd.factor
+++ b/basis/unix/statfs/openbsd/openbsd.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax unix.types unix.stat classes.struct ;
+USING: alien.c-types alien.syntax unix.types unix.stat classes.struct ;
 IN: unix.statfs.openbsd
 
 CONSTANT: MFSNAMELEN 16
@@ -25,9 +25,9 @@ STRUCT: statfs
     { f_owner uid_t }
     { f_ctime u_int32_t }
     { f_spare u_int32_t[3] }
-    { f_fstypename { "char" MFSNAMELEN } }
-    { f_mntonname { "char" MNAMELEN } }
-    { f_mntfromname { "char" MNAMELEN } }
+    { f_fstypename { char MFSNAMELEN } }
+    { f_mntonname { char MNAMELEN } }
+    { f_mntfromname { char MNAMELEN } }
     { mount_info char[160] } ;
 
 FUNCTION: int statfs ( char* path, statvfs* buf ) ;

diff --git a/basis/unix/statvfs/freebsd/freebsd.factor b/basis/unix/statvfs/freebsd/freebsd.factor
index 2fcd0c7372f0385150971916bfadea80b07c68c0..c2834736b7b103b8b35b6b4bbca65225632c031d 100644 (file)
--- a/basis/unix/statvfs/freebsd/freebsd.factor
+++ b/basis/unix/statvfs/freebsd/freebsd.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax classes.struct ;
+USING: alien.c-types alien.syntax classes.struct unix.types ;
 IN: unix.statvfs.freebsd
 
 STRUCT: statvfs

diff --git a/basis/unix/statvfs/linux/linux.factor b/basis/unix/statvfs/linux/linux.factor
index 6e408c8fa45214ae891bd528104e10fbec6d5a93..d7139d84b283a2530dd577e5dc7d2f2c378d8bd5 100644 (file)
--- a/basis/unix/statvfs/linux/linux.factor
+++ b/basis/unix/statvfs/linux/linux.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax classes.struct ;
+USING: alien.c-types alien.syntax classes.struct unix.types ;
 IN: unix.statvfs.linux
 
 STRUCT: statvfs64

diff --git a/basis/unix/statvfs/netbsd/netbsd.factor b/basis/unix/statvfs/netbsd/netbsd.factor
index 25c96dc15d32c8898907ac27a4846e5bb08859bb..c72a1a0e8234243e9bd9fcc89fe7558f2b5983b6 100644 (file)
--- a/basis/unix/statvfs/netbsd/netbsd.factor
+++ b/basis/unix/statvfs/netbsd/netbsd.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax classes.struct ;
+USING: alien.c-types alien.syntax classes.struct unix.types ;
 IN: unix.statvfs.netbsd
 
 CONSTANT: _VFS_NAMELEN    32

diff --git a/basis/unix/statvfs/openbsd/openbsd.factor b/basis/unix/statvfs/openbsd/openbsd.factor
index f2d12c29cc89c52f685be003424bee1139966bca..d5b2ee30a811a3b9d0caa33255e5bfcfed9fa441 100644 (file)
--- a/basis/unix/statvfs/openbsd/openbsd.factor
+++ b/basis/unix/statvfs/openbsd/openbsd.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien.syntax classes.struct ;
+USING: alien.c-types alien.syntax classes.struct unix.types ;
 IN: unix.statvfs.openbsd
 
 STRUCT: statvfs