Ported to ocaml-3.04.

diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
index 38c43c6d16e8e8c4383a66e243ff692cc21c083a..62df6201cad1f59b4f7094308fbef661da0c2c5b 100644 (file)
--- a/helm/ocaml/Makefile.common.in
+++ b/helm/ocaml/Makefile.common.in
@@ -10,7 +10,7 @@
 
 OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)" -pp camlp4o
 OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
 OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
 OCAMLDEP = ocamldep

diff --git a/helm/ocaml/pxp/csc_pxp_reader.ml b/helm/ocaml/pxp/csc_pxp_reader.ml
index daabedc90efe72e565a347218ad50990e648c2b3..0b849589a22b0a03027f76275e90fd199ecfc0c7 100644 (file)
--- a/helm/ocaml/pxp/csc_pxp_reader.ml
+++ b/helm/ocaml/pxp/csc_pxp_reader.ml
@@ -224,7 +224,7 @@ class resolve_read_any_channel ?(close=close_in) ~channel_of_id () =
 
     method clone =
       let c = new resolve_read_any_channel
-               ?close:(Some close) f_open () in
+               ?close:(Some close) ~channel_of_id:f_open () in
       c # init_rep_encoding internal_encoding;
       c # init_warner warner;
       clones <- c :: clones;
@@ -241,7 +241,7 @@ class resolve_read_this_channel1 is_stale ?id ?fixenc ?close ch =
   object (self)
     inherit resolve_read_any_channel
               ?close
-             (fun xid -> !getchannel xid)
+             ~channel_of_id:(fun xid -> !getchannel xid)
              ()
              as super
 
@@ -331,7 +331,7 @@ class resolve_read_any_string ~string_of_id () =
            current_string <- None
 
     method clone =
-      let c = new resolve_read_any_string f_open () in
+      let c = new resolve_read_any_string ~string_of_id:f_open () in
       c # init_rep_encoding internal_encoding;
       c # init_warner warner;
       clones <- c :: clones;
@@ -407,7 +407,7 @@ class resolve_read_url_channel
   object (self)
     inherit resolve_read_any_channel
               ?close
-             (fun xid -> !getchannel xid)
+             ~channel_of_id:(fun xid -> !getchannel xid)
              ()
              as super
 
@@ -912,6 +912,9 @@ class combine ?prefer ?(mode = Public_before_system) rl =
  * History:
  *
  * $Log$
+ * Revision 1.2  2002/01/29 14:44:29  sacerdot
+ * Ported to ocaml-3.04.
+ *
  * Revision 1.1  2001/11/26 18:28:28  sacerdot
  * HELM OCaml libraries with findlib support.
  *