Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #9 from djs55/type_conv

Fixes following type_conv changes
  • Loading branch information...
commit 6aa98ef613f83ce59253b05f12a8cda7b08bc8d8 2 parents bbd9b41 + 3964f0f
@samoht authored
Showing with 6 additions and 6 deletions.
  1. +1 −1  lib/META
  2. +4 −4 lib/Makefile
  3. +1 −1  lib/p4_rpc.ml
View
2  lib/META
@@ -4,7 +4,7 @@ requires = "rpc-light.xml, rpc-light.json"
package "syntax" (
description = "rpc-light: library to marshalling/unmarshalling ML types to/from RPC intermediate language"
- requires = "type-conv"
+ requires = "type_conv"
archive(syntax,preprocessor) = "pa_rpc.cma"
archive(syntax,toploop) = "pa_rpc.cma"
)
View
8 lib/Makefile
@@ -3,7 +3,7 @@ OCAMLOPT = ocamlfind ocamlopt
OCAMLFLAGS = -annot -g
PACKS = xmlm
-ICAMLP4 = -I $(shell ocamlfind query camlp4) -I $(shell ocamlfind query type-conv)
+ICAMLP4 = -I $(shell ocamlfind query camlp4) -I $(shell ocamlfind query type_conv)
DOCDIR = /myrepos/xen-api-libs.hg/doc
TARGETS = \
rpc.cmi rpc.cmo rpc.o rpc.cmx \
@@ -25,13 +25,13 @@ idl.cma: p4_rpc.cmo p4_idl.cmo
$(OCAMLC) -a $(ICAMLP4) -o $@ $^
pa_rpc.cmo: pa_rpc.ml p4_rpc.cmo pa_module_conv.cmo
- $(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
+ $(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<
p4_rpc.cmo: p4_rpc.ml rpc.cmo
- $(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
+ $(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<
p4_idl.cmo: p4_idl.ml p4_rpc.cmo
- $(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type-conv -pp "camlp4orf" $(ICAMLP4) $@ $<
+ $(OCAMLC) $(OCAMLFLAGS) -c -package camlp4,type_conv -pp "camlp4orf" $(ICAMLP4) $@ $<
%.o %.cmx: %.ml
$(OCAMLOPT) $(OCAMLFLAGS) -package $(PACKS) -c -o $@ $<
View
2  lib/p4_rpc.ml
@@ -465,7 +465,7 @@ module Of_rpc = struct
end
-let gen tds args =
+let gen args tds =
let _loc = loc_of_ctyp tds in
mapping := (match args with None -> [] | Some l -> l);
revmapping := List.map (fun (k,v) -> (v,k)) !mapping;
Please sign in to comment.
Something went wrong with that request. Please try again.