diff options
author | Samuel Mimram <smimram@debian.org> | 2008-07-25 15:13:01 +0200 |
---|---|---|
committer | Samuel Mimram <smimram@debian.org> | 2008-07-25 15:13:01 +0200 |
commit | d18b6226c9ecdb0ebbef6d29fb9f0c09ba78a5fa (patch) | |
tree | f9a2c15acb3448f4e78f4e8b7328f751fb144aa0 /lib/compat.ml4 | |
parent | 4892a9c7ae62f552fa42701788b2bd08a7f3bc08 (diff) | |
parent | a0cfa4f118023d35b767a999d5a2ac4b082857b4 (diff) |
Merge commit 'upstream/8.2.beta3+dfsg'
Diffstat (limited to 'lib/compat.ml4')
-rw-r--r-- | lib/compat.ml4 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/compat.ml4 b/lib/compat.ml4 index 372d2be3..40cffadb 100644 --- a/lib/compat.ml4 +++ b/lib/compat.ml4 @@ -6,13 +6,13 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* Compatibility file depending on ocaml version *) +(*i camlp4use: "pa_macro.cmo" i*) -(* type loc is different in 3.08 *) +(* Compatibility file depending on ocaml version *) IFDEF OCAML309 THEN DEFINE OCAML308 END -IFDEF CAMLP5 THEN +IFDEF CAMLP5 THEN module M = struct type loc = Stdpp.location let dummy_loc = Stdpp.dummy_loc @@ -45,7 +45,7 @@ type token = Token.t type lexer = Token.lexer let using l x = l.Token.using x end -ELSE +ELSE module M = struct type loc = int * int let dummy_loc = (0,0) @@ -63,8 +63,8 @@ END type loc = M.loc let dummy_loc = M.dummy_loc -let unloc = M.unloc let make_loc = M.make_loc +let unloc = M.unloc let join_loc = M.join_loc type token = M.token type lexer = M.lexer |