]> gitweb.factorcode.org Git - factor.git/commitdiff
Fix Linux bootstrap
authorsheeple <sheeple@joy.internal.stack-effects.com>
Tue, 12 Feb 2008 17:42:43 +0000 (11:42 -0600)
committersheeple <sheeple@joy.internal.stack-effects.com>
Tue, 12 Feb 2008 17:42:43 +0000 (11:42 -0600)
core/bootstrap/stage2.factor
extra/io/unix/linux/linux.factor

index 9dd56c6524c19891d3fce5d916f287dbaaf7619f..cd99796e7ef7c3cb785c56609387ba5a58e2f662 100755 (executable)
@@ -111,7 +111,8 @@ SYMBOL: bootstrap-time
         "output-image" get resource-path save-image-and-exit
     ] if
 ] [
-    print-error :c restarts.
+    :c
+    print-error restarts.
     "listener" vocab-main execute
     1 exit
 ] recover
index 960f0652fcf10b0a3702d819ad87ac623bca0e08..70f8038baf38e465e2ee9652e45c2c175df73668 100755 (executable)
@@ -42,8 +42,8 @@ TUPLE: inotify watches ;
     [ <linux-monitor> dup ] keep watches set-at ;
 
 : remove-watch ( monitor -- )
-    dup linux-monitor-wd watches delete-at
-    linux-monitor-wd inotify-fd swap inotify_rm_watch io-error ;
+    dup simple-monitor-handle watches delete-at
+    simple-monitor-handle inotify-fd swap inotify_rm_watch io-error ;
 
 M: linux-io <monitor> ( path recursive? -- monitor )
     drop IN_CHANGE_EVENTS add-watch ;