From: Joe Groff <arcata@gmail.com>
Date: Mon, 31 Aug 2009 17:01:04 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor into struct-updates
X-Git-Tag: 0.97~5647
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=1a84aa7fc37d04b334f79a7d8a3f260d76c3e2af

Merge branch 'master' of git://factorcode.org/git/factor into struct-updates
---

1a84aa7fc37d04b334f79a7d8a3f260d76c3e2af
diff --cc basis/io/files/info/unix/netbsd/netbsd.factor
index 7c282583a1,4ba85bd305..65c2d1d03c
mode 100644,100644..100755
--- a/basis/io/files/info/unix/netbsd/netbsd.factor
+++ b/basis/io/files/info/unix/netbsd/netbsd.factor
@@@ -4,7 -4,7 +4,7 @@@ USING: alien.syntax kernel unix.stat ma
  combinators system io.backend accessors alien.c-types
  io.encodings.utf8 alien.strings unix.types io.files.unix
  io.files io.files.info unix.statvfs.netbsd unix.getfsstat.netbsd arrays
--grouping sequences io.encodings.utf8 classes.struct
++grouping sequences io.encodings.utf8 classes.struct struct-arrays
  io.files.info.unix ;
  IN: io.files.info.unix.netbsd
  
@@@ -47,6 -47,6 +47,6 @@@ M: netbsd statvfs>file-system-info ( fi
  
  M: netbsd file-systems ( -- array )
      f 0 0 getvfsstat dup io-error
-     \ statvfs <c-array> dup dup length 0 getvfsstat io-error
-     \ statvfs heap-size group
-     [ f_mntonname>> utf8 alien>string file-system-info ] map ;
 -    \ statvfs <c-type-array>
++    \ statvfs <struct-array>
+     [ dup length 0 getvfsstat io-error ]
+     [ [ f_mntonname>> utf8 alien>string file-system-info ] map ] bi ;
diff --cc basis/io/files/info/unix/openbsd/openbsd.factor
index 242938a47c,c1a9347686..c3671391b9
mode 100644,100644..100755
--- a/basis/io/files/info/unix/openbsd/openbsd.factor
+++ b/basis/io/files/info/unix/openbsd/openbsd.factor
@@@ -4,7 -4,7 +4,7 @@@ USING: accessors alien.c-types alien.st
  combinators io.backend io.files io.files.info io.files.unix kernel math
  sequences system unix unix.getfsstat.openbsd grouping
  unix.statfs.openbsd unix.statvfs.openbsd unix.types
--arrays io.files.info.unix classes.struct ;
++arrays io.files.info.unix classes.struct struct-arrays ;
  IN: io.files.unix.openbsd
  
  TUPLE: freebsd-file-system-info < unix-file-system-info