oxenstored: allow compilation prior to OCaml 3.12.0
authorJonathan Davies <jonathan.davies@citrix.com>
Wed, 30 Mar 2016 16:06:39 +0000 (16:06 +0000)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 30 Mar 2016 16:15:13 +0000 (12:15 -0400)
Commit 363ae55c8 used an OCaml feature called record field punning. This broke
the build on compilers prior to OCaml 3.12.0.

This patch makes no semantic change but now uses backwards-compatible syntax.

Signed-off-by: Jonathan Davies <jonathan.davies@citrix.com>
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
tools/ocaml/xenstored/process.ml

index fb5fdaf0fb0fd5f90cf502e45b7a0f9bcbe2a798..7b60376cdd86f0bb8e0fea239df222a1a715a872 100644 (file)
@@ -484,7 +484,7 @@ let do_input store cons doms con =
        if newpacket then (
                let packet = Connection.pop_in con in
                let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in
-               let req = {Packet.tid; Packet.rid; Packet.ty; Packet.data} in
+               let req = {Packet.tid=tid; Packet.rid=rid; Packet.ty=ty; Packet.data=data} in
 
                (* As we don't log IO, do not call an unnecessary sanitize_data 
                   info "[%s] -> [%d] %s \"%s\""