diff options
Diffstat (limited to 'otherlibs/labltk/browser')
-rw-r--r-- | otherlibs/labltk/browser/dummyUnix.mli | 6 | ||||
-rw-r--r-- | otherlibs/labltk/browser/main.ml | 4 | ||||
-rw-r--r-- | otherlibs/labltk/browser/shell.ml | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/otherlibs/labltk/browser/dummyUnix.mli b/otherlibs/labltk/browser/dummyUnix.mli index b2ce9e04d..d08d12e26 100644 --- a/otherlibs/labltk/browser/dummyUnix.mli +++ b/otherlibs/labltk/browser/dummyUnix.mli @@ -24,9 +24,3 @@ module Thread : sig type t external create : ('a -> 'b) -> 'a -> t = "caml_input" end - -module ThreadUnix : sig - open Unix - external read : file_descr -> buf:string -> pos:int -> len:int -> int - = "caml_input" -end diff --git a/otherlibs/labltk/browser/main.ml b/otherlibs/labltk/browser/main.ml index e6f325f17..2c8bfd184 100644 --- a/otherlibs/labltk/browser/main.ml +++ b/otherlibs/labltk/browser/main.ml @@ -19,7 +19,7 @@ open Tk let _ = let path = ref [] in - let st = ref false in + let st = ref true in Arg.parse [ "-I", Arg.String (fun s -> path := s :: !path), "<dir> Add <dir> to the list of include directories"; @@ -28,7 +28,7 @@ let _ = " Ignore non-optional labels in types"; "-rectypes", Arg.Set Clflags.recursive_types, " Allow arbitrary recursive types"; - "-st", Arg.Set st, " Smalltalk-like one-box browsing"; + "-oldui", Arg.Clear st, " Revert back to old UI"; "-w", Arg.String (fun s -> Shell.warnings := s), "<flags> Enable or disable warnings according to <flags>:\n\ \032 A/a enable/disable all warnings\n\ diff --git a/otherlibs/labltk/browser/shell.ml b/otherlibs/labltk/browser/shell.ml index a0dcf2a05..b157a960d 100644 --- a/otherlibs/labltk/browser/shell.ml +++ b/otherlibs/labltk/browser/shell.ml @@ -196,7 +196,7 @@ object (self) let fileinput_thread fd = let buf = String.create 1024 in let len = ref 0 in - try while len := ThreadUnix.read fd ~buf ~pos:0 ~len:1024; !len > 0 do + try while len := Unix.read fd ~buf ~pos:0 ~len:1024; !len > 0 do Mutex.lock imutex; Buffer.add_substring ibuffer buf 0 !len; Mutex.unlock imutex |