From da3edaa7eab2bed17cdfb2c455f2e6b5b0318c4d Mon Sep 17 00:00:00 2001
From: letouzey
Date: Sat, 15 Sep 2007 10:35:59 +0000
Subject: * Adding compability with ocaml 3.10 + camlp5 (rework of   the patch
 by S. Mimram) * for detecting architecture, also look for /bin/uname *
 restore the compatibility of kernel/byterun/coq_interp.c with   ocaml 3.07
 (caml_modify vs. modify). There is still an issue   with this 3.07 and
 64-bits architecture (see coqdev and a future   bug report).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10122 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 lib/util.ml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/util.ml')

diff --git a/lib/util.ml b/lib/util.ml
index 1d1c5e060b..fa21cd83ed 100644
--- a/lib/util.ml
+++ b/lib/util.ml
@@ -26,15 +26,13 @@ type loc = Compat.loc
 let dummy_loc = Compat.dummy_loc
 let unloc = Compat.unloc
 let make_loc = Compat.make_loc
+let join_loc = Compat.join_loc
 
 (* raising located exceptions *)
 type 'a located = loc * 'a
 let anomaly_loc (loc,s,strm) = Stdpp.raise_with_loc loc (Anomaly (s,strm))
 let user_err_loc (loc,s,strm) = Stdpp.raise_with_loc loc (UserError (s,strm))
 let invalid_arg_loc (loc,s) = Stdpp.raise_with_loc loc (Invalid_argument s)
-let join_loc loc1 loc2 =
-  if loc1 = dummy_loc or loc2 = dummy_loc then dummy_loc
-  else (fst loc1, snd loc2)
 
 (* Like Exc_located, but specifies the outermost file read, the filename
    associated to the location of the error, and the error itself. *)
-- 
cgit v1.2.3