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
---
 parsing/argextend.ml4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'parsing/argextend.ml4')

diff --git a/parsing/argextend.ml4 b/parsing/argextend.ml4
index 7585ad4d86..b4fa39bebe 100644
--- a/parsing/argextend.ml4
+++ b/parsing/argextend.ml4
@@ -14,7 +14,7 @@ open Genarg
 open Q_util
 open Q_coqast
 
-let join_loc (deb1,_) (_,fin2) = (deb1,fin2)
+let join_loc = Util.join_loc
 let loc = Util.dummy_loc
 let default_loc = <:expr< Util.dummy_loc >>
 
@@ -228,7 +228,7 @@ EXTEND
         let t, g = interp_entry_name loc e sep in (g, Some (s,t))
       | s = STRING ->
 	  if String.length s > 0 && Util.is_letter s.[0] then
-	    Pcoq.lexer.Token.using ("", s);
+	    Compat.using Pcoq.lexer ("", s);
         (<:expr< (Gramext.Stoken (Lexer.terminal $str:s$)) >>, None)
     ] ]
   ;
-- 
cgit v1.2.3