io.encodings.utf16n: merge with io.encodings.utf16

[factor.git] / basis / io / monitors / windows / windows.factor

diff --git a/basis/io/monitors/windows/windows.factor b/basis/io/monitors/windows/windows.factor
index 434437dddc82d4d28cad630abeec665075c859d0..958fa3ed3a1b2ee0734ea09020df83ea2b92ba00 100644 (file)
--- a/basis/io/monitors/windows/windows.factor
+++ b/basis/io/monitors/windows/windows.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2008 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien alien.data arrays classes.struct
-combinators continuations destructors io.backend
-io.encodings.string io.encodings.utf16n io.files.windows
+combinators continuations destructors fry io.backend
+io.encodings.string io.encodings.utf16 io.files.windows
 io.monitors io.pathnames io.ports kernel literals locals make
 math sequences system threads windows.errors windows.kernel32
 windows.types ;
@@ -85,8 +85,8 @@ TUPLE: win32-monitor < monitor port ;
     dup fill-queue (fill-queue-thread) ;
 
 : fill-queue-thread ( monitor -- )
-    [ dup fill-queue (fill-queue-thread) ]
-    [ dup already-disposed? [ 2drop ] [ rethrow ] if ] recover ;
+    '[ _ dup fill-queue (fill-queue-thread) ]
+    [ already-disposed? ] ignore-error ;
 
 M:: windows (monitor) ( path recursive? mailbox -- monitor )
     [