aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2004-07-27 12:14:05 +0000
committerherbelin2004-07-27 12:14:05 +0000
commit0937181a4313f08de4a8598bf2fda6a5f7b2e4ed (patch)
tree003bfed9cc045765657bb90dbce38bf0e426b151
parent875f0eb807a039888cd3e2c31e8615ec4caf3e51 (diff)
Utilisation de la variable camlp4 OCAML_308 plutôt que d'en reconstruire une nous-mêmes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@5979 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--Makefile4
-rw-r--r--lib/compat.ml42
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index acee155ea6..06e8b8ddca 100644
--- a/Makefile
+++ b/Makefile
@@ -1400,11 +1400,11 @@ ML4FILES += lib/pp.ml4 lib/compat.ml4
lib/compat.cmo: lib/compat.ml4
$(SHOW)'OCAMLC4 $<'
- $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) pa_ifdef.cmo -D$(CAMLVERSION) -impl" -c -impl $<
+ $(HIDE)$(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) pa_ifdef.cmo -impl" -c -impl $<
lib/compat.cmx: lib/compat.ml4
$(SHOW)'OCAMLOPT $<'
- $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) pa_ifdef.cmo -D$(CAMLVERSION) -impl" -c -impl $<
+ $(HIDE)$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) pa_ifdef.cmo -impl" -c -impl $<
# files compiled with camlp4 because of streams syntax
diff --git a/lib/compat.ml4 b/lib/compat.ml4
index 5e1c65b438..6c2102491f 100644
--- a/lib/compat.ml4
+++ b/lib/compat.ml4
@@ -11,7 +11,7 @@
(* IFDEF not available in 3.06; use ifdef instead *)
(* type loc is different in 3.08 *)
-ifdef OCAML308 then
+ifdef OCAML_308 then
module M = struct
type loc = Token.flocation
let dummy_loc = Token.dummy_loc