Merge branch 'master' of git://factorcode.org/git/factor

basis/unix/stat/linux/64/64.factor

@@ -59,11 +59,6 @@ TUPLE: fstab spec file vfstype mntops type freq passno ;
         [ fstab-fs_passno >>passno ]
     } cleave ;
 
-C-STRUCT: fsid
-    { { "int" 2 } "__val" } ;
-
-TYPEDEF: fsid __fsid_t
-
 TYPEDEF: ssize_t __SWORD_TYPE
 TYPEDEF: ulonglong __fsblkcnt64_t
 TYPEDEF: ulonglong __fsfilcnt64_t

basis/unix/stat/linux/linux.factor

@@ -1,6 +1,11 @@
-USING: layouts combinators vocabs.loader ;
+USING: alien.syntax layouts combinators vocabs.loader ;
 IN: unix.stat
 
+C-STRUCT: fsid
+    { { "int" 2 } "__val" } ;
+
+TYPEDEF: fsid __fsid_t
+
 cell-bits
 {
     { 32 [ "unix.stat.linux.32" require ] }