Imported Upstream version 8.5~beta1+dfsg

1 files changed, 11 insertions, 8 deletions

diff --git a/tools/coqdep_common.mli b/tools/coqdep_common.mli
index b2e01f58..71b96ca0 100644
--- a/tools/coqdep_common.mli
+++ b/tools/coqdep_common.mli
@@ -1,6 +1,6 @@
 (************************************************************************)
 (*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2014     *)
+(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2015     *)
 (*   \VV/  **************************************************************)
 (*    //   *      This file is distributed under the terms of the       *)
 (*         *       GNU Lesser General Public License Version 2.1        *)
@@ -8,7 +8,7 @@
 
 val option_c : bool ref
 val option_noglob : bool ref
-val option_slash : bool ref
+val option_boot : bool ref
 val option_natdynlk : bool ref
 val option_mldep : string option ref
 val norec_dirs : string list ref
@@ -23,13 +23,13 @@ val mliAccu : (string * dir) list ref
 val mllibAccu : (string * dir) list ref
 val vAccu : (string * string) list ref
 val addQueue : 'a list ref -> 'a -> unit
-val add_ml_known : string -> dir -> unit
+val add_ml_known : string -> dir -> string -> unit
 val iter_ml_known : (string -> dir -> unit) -> unit
 val search_ml_known : string -> dir option
-val add_mli_known : string -> dir -> unit
+val add_mli_known : string -> dir -> string -> unit
 val iter_mli_known : (string -> dir -> unit) -> unit
 val search_mli_known : string -> dir option
-val add_mllib_known : string -> dir -> unit
+val add_mllib_known : string -> dir -> string -> unit
 val search_mllib_known : string -> dir option
 val vKnown : (string list, string) Hashtbl.t
 val coqlibKnown : (string list, unit) Hashtbl.t
@@ -39,12 +39,15 @@ val canonize : string -> string
 val mL_dependencies : unit -> unit
 val coq_dependencies : unit -> unit
 val suffixes : 'a list -> 'a list list
-val add_known : string -> string list -> string -> unit
+val add_known : bool -> string -> string list -> string -> unit
+val add_caml_known : string -> string list -> string -> unit
 val add_directory :
   bool ->
   (string -> string list -> string -> unit) -> string -> string list -> unit
+val add_caml_dir : string -> unit
 val add_dir :
-  (string -> string list -> string -> unit) -> string -> string list -> unit
+  (bool -> string -> string list -> string -> unit) -> string -> string list -> unit
 val add_rec_dir :
-  (string -> string list -> string -> unit) -> string -> string list -> unit
+  (bool -> string -> string list -> string -> unit) -> string -> string list -> unit
 val treat_file : dir -> string -> unit
+val error_cannot_parse : string -> int * int -> 'a