From: Jon Ludlam <Jonathan.Ludlam@eu.citrix.com>
Date: Fri, 18 Jun 2010 13:13:26 +0000 (+0100)
Subject: Change the 'close' field in the request record to be mutable rather than a reference
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2a4947939773279a301573ca88fba595fff5b927;p=xcp%2Fxen-api-libs.git

Change the 'close' field in the request record to be mutable rather than a reference

Signed-off-by: Jon Ludlam <Jonathan.Ludlam@eu.citrix.com>

diff -r d8eb3fec758c http-svr/Makefile--- a/http-svr/Makefile	Mon Mar 15 11:57:11 2010 +0000
+++ b/http-svr/Makefile	Mon Mar 15 12:01:14 2010 +0000
@@ -8,6 +8,8 @@
 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
 OCAMLOPTFLAGS = -g -dtypes

+PP = camlp4o -I ../rpc-light -I $(shell ocamlfind query type-conv) pa_type_conv.cmo pa_rpc.cma
+
 OCAMLABI := $(shell ocamlc -version)
 OCAMLLIBDIR := $(shell ocamlc -where)
 OCAMLDESTDIR ?= $(OCAMLLIBDIR)
@@ -31,13 +33,13 @@
 	$(OCAMLC) -a -o $@ $(foreach obj,$(OBJS),$(obj).cmo)

 %.cmo: %.ml %.cmi
-	$(OCAMLC) -c -thread -I ../stdext -I ../log -o $@ $<
+	$(OCAMLC) -c -pp '${PP}' -thread -I ../rpc-light -I ../stdext -I ../log -o $@ $<

 %.cmi: %.mli
-	$(OCAMLC) -c -thread -o $@ $<
+	$(OCAMLC) -c -I ../rpc-light -thread -o $@ $<

 %.cmx: %.ml %.cmi
-	$(OCAMLOPT) $(OCAMLOPTFLAGS) -c -thread -I ../stdext -I ../log -o $@ $<
+	$(OCAMLOPT) $(OCAMLOPTFLAGS) -pp '${PP}' -c -thread -I ../rpc-light -I ../stdext -I ../log -o $@ $<

 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
---

diff --git a/http-svr/Makefile b/http-svr/Makefile
index ec70af0..6d7411b 100644
--- a/http-svr/Makefile
+++ b/http-svr/Makefile
@@ -8,6 +8,8 @@ LDFLAGS = -cclib -L./
 VERSION := $(shell hg parents --template "{rev}" 2>/dev/null || echo 0.0)
 OCAMLOPTFLAGS = -g -dtypes
 
+PP = camlp4o -I ../rpc-light -I $(shell ocamlfind query type-conv) pa_type_conv.cmo pa_rpc.cma
+
 OCAMLABI := $(shell ocamlc -version)
 OCAMLLIBDIR := $(shell ocamlc -where)
 OCAMLDESTDIR ?= $(OCAMLLIBDIR)
@@ -31,13 +33,13 @@ http_svr.cma: $(foreach obj,$(OBJS),$(obj).cmo)
 	$(OCAMLC) -a -o $@ $(foreach obj,$(OBJS),$(obj).cmo)
 
 %.cmo: %.ml %.cmi
-	$(OCAMLC) -c -thread -I ../stdext -I ../log -o $@ $<
+	$(OCAMLC) -c -pp '${PP}' -thread -I ../rpc-light -I ../stdext -I ../log -o $@ $<
 
 %.cmi: %.mli
-	$(OCAMLC) -c -thread -o $@ $<
+	$(OCAMLC) -c -I ../rpc-light -thread -o $@ $<
 
 %.cmx: %.ml %.cmi
-	$(OCAMLOPT) $(OCAMLOPTFLAGS) -c -thread -I ../stdext -I ../log -o $@ $<
+	$(OCAMLOPT) $(OCAMLOPTFLAGS) -pp '${PP}' -c -thread -I ../rpc-light -I ../stdext -I ../log -o $@ $<
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<