From: Joe Groff <arcata@gmail.com>
Date: Mon, 31 Aug 2009 15:35:58 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~5650
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=2d37ac31be7491fcb68e1c9121395c358c886d8b

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

Conflicts:
	basis/environment/winnt/winnt.factor
	basis/io/files/windows/nt/nt.factor
	basis/windows/shell32/shell32.factor
---

2d37ac31be7491fcb68e1c9121395c358c886d8b
diff --cc basis/io/files/info/unix/netbsd/netbsd.factor
index d2e7bc9d6b,d2e7bc9d6b..7c282583a1
--- a/basis/io/files/info/unix/netbsd/netbsd.factor
+++ b/basis/io/files/info/unix/netbsd/netbsd.factor
@@@ -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-type-array> dup dup length 0 getvfsstat 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 ;
diff --cc basis/io/files/info/unix/openbsd/openbsd.factor
index 6c334b8d62,6c334b8d62..242938a47c
--- a/basis/io/files/info/unix/openbsd/openbsd.factor
+++ b/basis/io/files/info/unix/openbsd/openbsd.factor
@@@ -47,6 -47,6 +47,6 @@@ M: openbsd statvfs>file-system-info ( f
  
  M: openbsd file-systems ( -- seq )
      f 0 0 getfsstat dup io-error
--    \ statfs <c-type-array> dup dup length 0 getfsstat io-error 
++    \ statfs <c-array> dup dup length 0 getfsstat io-error 
      \ statfs heap-size group 
      [ f_mntonname>> alien>native-string file-system-info ] map ;
diff --cc basis/windows/errors/errors.factor
index 5551d34028,ea9c297c44..5a1bf74d19
--- a/basis/windows/errors/errors.factor
+++ b/basis/windows/errors/errors.factor
@@@ -698,6 -696,8 +698,8 @@@ CONSTANT: FORMAT_MESSAGE_MAX_WIDTH_MAS
  : make-lang-id ( lang1 lang2 -- n )
      10 shift bitor ; inline
  
 -<< "TCHAR" require-c-type-arrays >>
++<< "TCHAR" require-c-arrays >>
+ 
  ERROR: error-message-failed id ;
  :: n>win32-error-string ( id -- string )
      {
@@@ -707,7 -707,7 +709,7 @@@
      f
      id
      LANG_NEUTRAL SUBLANG_DEFAULT make-lang-id
-     32768 [ "TCHAR" <c-array> ] keep 
 -    32768 [ "TCHAR" <c-type-array> ] [ ] bi
++    32768 [ "TCHAR" <c-array> ] [ ] bi
      f pick [ FormatMessage 0 = [ id error-message-failed ] when ] dip
      utf16n alien>string [ blank? ] trim ;