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

diff --combined basis/io/unix/files/files.factor
index 4b570b6a89f3f6739270e18d019fcde85ece05f4,05bab8c6540e4527678d483b27c1fe95d4d19c4d..1fc5fe92261b5770fb189e84c62589fb9949d65c
--- 1/basis/io/unix/files/files.factor
--- 2/basis/io/unix/files/files.factor
+++ b/basis/io/unix/files/files.factor
@@@ -80,7 -80,7 +80,7 @@@ TUPLE: unix-file-system-info < file-sys
  block-size preferred-block-size
  blocks blocks-free blocks-available
  files files-free files-available
- name-max flags id id0 id1 ;
+ name-max flags id ;
  
  HOOK: new-file-system-info os ( --  file-system-info )
  
@@@ -108,8 -108,6 +108,6 @@@ M: unix statvfs>file-system-info drop 
          [ dup [ blocks-free>> ] [ block-size>> ] bi * >>free-space drop ]
          [ dup [ blocks>> ] [ block-size>> ] bi * >>total-space drop ]
          [ dup [ total-space>> ] [ free-space>> ] bi - >>used-space drop ]
-         [ dup id>> 2 c-uint-array> first2 [ >>id0 ] [ >>id1 ] bi* drop ]
-         [ f >>id drop ]
          [ ]
      } cleave ;
  
@@@ -316,7 -314,8 +314,7 @@@ PRIVATE
  <PRIVATE
  
  : make-timeval-array ( array -- byte-array )
 -    [ length "timeval" <c-array> ] keep
 -    dup length [ over [ pick set-timeval-nth ] [ 2drop ] if ] 2each ;
 +    [ [ "timeval" <c-object> ] unless* ] map concat ;
  
  : timestamp>timeval ( timestamp -- timeval )
      unix-1970 time- duration>microseconds make-timeval ;