src/Pure/ML-Systems/multithreading_polyml.ML

     (let
         val _ = Thread.setAttributes new_atts;
         val result = Exn.capture (f orig_atts) x;
         val _ = restore ();
       in result end
-      handle Interrupt => (restore (); Exn.Exn Interrupt))
+      handle Exn.Interrupt => (restore (); Exn.Exn Exn.Interrupt))
   end;
 
 fun interruptible f = with_attributes regular_interrupts (fn _ => f);
 
 fun uninterruptible f =

     val watchdog = Thread.fork (fn () =>
       (OS.Process.sleep time; timeout := true; Thread.interrupt worker), []);
 
     (*RACE! timeout signal vs. external Interrupt*)
     val result = Exn.capture (restore_attributes f) x;
-    val was_timeout = (case result of Exn.Exn Interrupt => ! timeout | _ => false);
+    val was_timeout = (case result of Exn.Exn Exn.Interrupt => ! timeout | _ => false);
 
     val _ = Thread.interrupt watchdog handle Thread _ => ();
   in if was_timeout then raise TimeOut else Exn.release result end) ();
 
 end;

         (OS.Process.sleep (Time.fromMilliseconds 100); if n > 0 then kill (n - 1) else ());
 
     val _ = while ! result = Wait do
       restore_attributes (fn () =>
         (ConditionVar.waitUntil (result_cond, result_mutex, Time.now () + Time.fromMilliseconds 100); ())
-          handle Interrupt => kill 10) ();
+          handle Exn.Interrupt => kill 10) ();
 
     (*cleanup*)
     val output = read_file output_name handle IO.Io _ => "";
     val _ = OS.FileSys.remove script_name handle OS.SysErr _ => ();
     val _ = OS.FileSys.remove pid_name handle OS.SysErr _ => ();
     val _ = OS.FileSys.remove output_name handle OS.SysErr _ => ();
     val _ = Thread.interrupt system_thread handle Thread _ => ();
-    val rc = (case ! result of Signal => raise Interrupt | Result rc => rc);
+    val rc = (case ! result of Signal => raise Exn.Interrupt | Result rc => rc);
   in (output, rc) end) ();
 
 
 (* critical section -- may be nested within the same thread *)