Skip to content

Commit

Permalink
more fix stdlib warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
rjbou committed Apr 16, 2020
1 parent c5aab9b commit 840fdca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/core/opamCompat.mli
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,7 @@ module Filename
val extension : string -> string
end
#endif

#if OCAML_VERSION < (4, 7, 0)
module Stdlib = Pervasives
#endif
1 change: 1 addition & 0 deletions src/core/opamFilename.ml
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,7 @@ let flock flag ?dontblock file = OpamSystem.flock flag ?dontblock (to_string fil
let with_flock flag ?dontblock file f =
let lock = OpamSystem.flock flag ?dontblock (to_string file) in
try
let open OpamCompat in
let (fd, ch) =
match OpamSystem.get_lock_fd lock with
| exception Not_found ->
Expand Down
3 changes: 2 additions & 1 deletion src/core/opamProcess.ml
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,8 @@ let exit_status p return =
if isset_verbose_f () then
stop_verbose_f ()
else if p.p_verbose then
(verbose_print_cmd p;
(let open OpamCompat in
verbose_print_cmd p;
List.iter verbose_print_out stdout;
List.iter verbose_print_out stderr;
flush Stdlib.stdout);
Expand Down

0 comments on commit 840fdca

Please sign in to comment.