From 840fdca7b88d0219c0c32f3117ac2807ce499bb4 Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Wed, 8 Apr 2020 21:28:54 +0200 Subject: [PATCH] more fix stdlib warnings --- src/core/opamCompat.mli | 4 ++++ src/core/opamFilename.ml | 1 + src/core/opamProcess.ml | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/core/opamCompat.mli b/src/core/opamCompat.mli index 2e6a51ae49a..02545d46e0d 100644 --- a/src/core/opamCompat.mli +++ b/src/core/opamCompat.mli @@ -89,3 +89,7 @@ module Filename val extension : string -> string end #endif + +#if OCAML_VERSION < (4, 7, 0) +module Stdlib = Pervasives +#endif diff --git a/src/core/opamFilename.ml b/src/core/opamFilename.ml index 14df3f3051b..f4cfd958496 100644 --- a/src/core/opamFilename.ml +++ b/src/core/opamFilename.ml @@ -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 -> diff --git a/src/core/opamProcess.ml b/src/core/opamProcess.ml index 3413ce787f0..aa55272900a 100644 --- a/src/core/opamProcess.ml +++ b/src/core/opamProcess.ml @@ -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);