diff options
| author | Maxime Dénès | 2016-07-03 18:54:06 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2016-07-03 18:54:06 +0200 |
| commit | e278d031a1d9a7bf3de463d3d415065299c99395 (patch) | |
| tree | ddd3a123e1887a9fa4634af7559bc7bb67b0cc25 /lib/spawn.ml | |
| parent | d7664c0530edd196d52e9fd8a4b925dbfefd1b9b (diff) | |
| parent | 3ce70f21a18cc19e720e8ac54b93652527881942 (diff) | |
Merge branch 'cerrors-cclosure' into trunk
Was PR#226: CErrors & CClosure
Diffstat (limited to 'lib/spawn.ml')
| -rw-r--r-- | lib/spawn.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spawn.ml b/lib/spawn.ml index 2b9c4ccac1..4791769735 100644 --- a/lib/spawn.ml +++ b/lib/spawn.ml @@ -43,7 +43,7 @@ module type MainLoopModel = sig end (* Common code *) -let assert_ b s = if not b then Errors.anomaly (Pp.str s) +let assert_ b s = if not b then CErrors.anomaly (Pp.str s) (* According to http://caml.inria.fr/mantis/view.php?id=5325 * you can't use the same socket for both writing and reading (may change @@ -192,7 +192,7 @@ let spawn ?(prefer_sock=prefer_sock) ?(env=Unix.environment ()) let live = callback cl ~read_all:(fun () -> ML.read_all gchan) in if not live then kill p; live - with e when Errors.noncritical e -> + with e when CErrors.noncritical e -> pr_err ("Async reader raised: " ^ (Printexc.to_string e)); kill p; false) gchan |