[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] tools/ocaml: remove uint32 use added by 674ad2b



commit 2b4778b3f35dd67b12ed9dad1c65b28e71bbe9d1
Author:     Michael Young <m.a.young@xxxxxxxxxxxx>
AuthorDate: Sun Feb 8 15:54:23 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Feb 19 16:28:43 2015 +0000

    tools/ocaml: remove uint32 use added by 674ad2b
    
    In 674ad2b (xenstore: extend the xenstore ring with a 'closing' signal)
    two uses of uint32 are added to tools/ocaml/libs/xb/xs_ring_stubs.c .
    As of ocaml 4.03.0+dev the uint32 type is no longer supported. This patch
    replaces the uses of uint32 with uint32_t .
    
    Signed-off-by: Michael Young <m.a.young@xxxxxxxxxxxx>
    Acked-by: David Scott <dave.scott@xxxxxxxxxx>
---
 tools/ocaml/libs/xb/xs_ring_stubs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c 
b/tools/ocaml/libs/xb/xs_ring_stubs.c
index fc9b0c5..fd561a2 100644
--- a/tools/ocaml/libs/xb/xs_ring_stubs.c
+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c
@@ -55,7 +55,7 @@ CAMLprim value ml_interface_read(value ml_interface,
 
        cons = *(volatile uint32_t*)&intf->req_cons;
        prod = *(volatile uint32_t*)&intf->req_prod;
-       connection = *(volatile uint32*)&intf->connection;
+       connection = *(volatile uint32_t*)&intf->connection;
 
        if (connection != XENSTORE_CONNECTED)
                caml_raise_constant(*caml_named_value("Xb.Reconnect"));
@@ -105,7 +105,7 @@ CAMLprim value ml_interface_write(value ml_interface,
 
        cons = *(volatile uint32_t*)&intf->rsp_cons;
        prod = *(volatile uint32_t*)&intf->rsp_prod;
-       connection = *(volatile uint32*)&intf->connection;
+       connection = *(volatile uint32_t*)&intf->connection;
 
        if (connection != XENSTORE_CONNECTED)
                caml_raise_constant(*caml_named_value("Xb.Reconnect"));
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.