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

[factor.git] / basis / windows / errors / errors.factor

diff --git a/basis/windows/errors/errors.factor b/basis/windows/errors/errors.factor
index 5551d34028f6c3fc20b329d6f62f3e10b0793501..5a1bf74d19e04a860715b866fa6e8d7a1ff9b73f 100644 (file)
--- a/basis/windows/errors/errors.factor
+++ b/basis/windows/errors/errors.factor
@@ -698,6 +698,8 @@ CONSTANT: FORMAT_MESSAGE_MAX_WIDTH_MASK   HEX: 000000FF
 : make-lang-id ( lang1 lang2 -- n )
     10 shift bitor ; inline
 
+<< "TCHAR" require-c-arrays >>
+
 ERROR: error-message-failed id ;
 :: n>win32-error-string ( id -- string )
     {
@@ -707,7 +709,7 @@ ERROR: error-message-failed id ;
     f
     id
     LANG_NEUTRAL SUBLANG_DEFAULT make-lang-id
-    32768 [ "TCHAR" <c-array> ] keep 
+    32768 [ "TCHAR" <c-array> ] [ ] bi
     f pick [ FormatMessage 0 = [ id error-message-failed ] when ] dip
     utf16n alien>string [ blank? ] trim ;