diff options
| author |  Samuel Mimram <smimram@debian.org> | 2006-04-28 14:59:16 +0000 |
|---|---|---|
| committer | Samuel Mimram <smimram@debian.org> | 2006-04-28 14:59:16 +0000 |
| commit | 2c4a6b4efe55a2c6ca9ca7b185723e7909e57269 (patch) | |
| tree | e1542c8adb83ff297284eefc23a2703461713d9b /toplevel/mltop.ml4 | |
| parent | 514dce2dfe717e3ed2e37dce6467b56219d451c1 (diff) | |
| parent | 3ef7797ef6fc605dfafb32523261fe1b023aeecb (diff) | |
Merge commit 'upstream/8.0pl3+8.1alpha' into 8.0pl3+8.1alpha
Diffstat (limited to 'toplevel/mltop.ml4')
| -rw-r--r-- | toplevel/mltop.ml4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toplevel/mltop.ml4 b/toplevel/mltop.ml4 index 4da23d42..a3b7fc14 100644 --- a/toplevel/mltop.ml4 +++ b/toplevel/mltop.ml4 @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: mltop.ml4,v 1.29.2.3 2004/07/17 13:00:15 herbelin Exp $ *) +(* $Id: mltop.ml4 6692 2005-02-06 13:03:51Z herbelin $ *) open Util open Pp @@ -109,7 +109,7 @@ let dir_ml_load s = [Filename.dirname gname] with | Dynlink.Error a -> errorlabstrm "Mltop.load_object" [< str (Dynlink.error_message a) >] - else () + else () | Native -> errorlabstrm "Mltop.no_load_object" [< str"Loading of ML object file forbidden in a native Coq" >] @@ -137,7 +137,7 @@ let add_path ~unix_path:dir ~coq_root:coq_dirpath = if exists_dir dir then begin add_ml_dir dir; - Library.add_load_path_entry (dir,coq_dirpath) + Library.add_load_path (dir,coq_dirpath) end else msg_warning [< str ("Cannot open " ^ dir) >] @@ -160,7 +160,7 @@ let add_rec_path ~unix_path:dir ~coq_root:coq_dirpath = let dirs = map_succeed convert_dirs dirs in begin List.iter (fun lpe -> add_ml_dir (fst lpe)) dirs; - List.iter Library.add_load_path_entry dirs + List.iter Library.add_load_path dirs end else msg_warning [< str ("Cannot open " ^ dir) >] |