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

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

175529c9387e66ebf91817f6b47991a226f03ecd
diff --cc basis/io/files/info/unix/openbsd/openbsd.factor
index fe2101dc87,f28d085039..3cf2863713
mode 100755,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,8 @@@ 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 struct-arrays ;
 -arrays io.files.info.unix classes.struct io.encodings.utf8 ;
++arrays io.files.info.unix classes.struct struct-arrays
++io.encodings.utf8 ;
  IN: io.files.unix.openbsd
  
  TUPLE: freebsd-file-system-info < unix-file-system-info
@@@ -47,6 -47,6 +48,6 @@@ M: openbsd statvfs>file-system-info ( f
  
  M: openbsd file-systems ( -- seq )
      f 0 0 getfsstat dup io-error
--    \ statfs <c-type-array>
++    \ statfs <struct-array>
      [ dup length 0 getfsstat io-error ]
      [ [ f_mntonname>> utf8 alien>string file-system-info ] map ] bi ;