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

[Xen-changelog] [xen master] tools/ocaml: remove uint32 use



commit ddfb12eed686148fc50bbf58e992dc2d2c627b22
Author:     M A Young <m.a.young@xxxxxxxxxxxx>
AuthorDate: Sun Sep 7 20:10:33 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Mon Sep 8 10:59:59 2014 +0100

    tools/ocaml: remove uint32 use
    
    OCaml is replacing its own uint32 type with the ISO C99 uint32_t type
    in 4.03.0+dev. Ths patch replaces the remaining uses of uint32 with
    uint32_t in the ocaml C code for xen.
    
    Signed-off-by: Michael Young <m.a.young@xxxxxxxxxxxx>
    Acked-by: David Scott <dave.scott@xxxxxxxxxx>
---
 tools/ocaml/libs/xb/xs_ring_stubs.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c 
b/tools/ocaml/libs/xb/xs_ring_stubs.c
index 8bd1047..17656c2 100644
--- a/tools/ocaml/libs/xb/xs_ring_stubs.c
+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <xenctrl.h>
 #include <xen/io/xs_wire.h>
@@ -42,8 +43,8 @@ static int xs_ring_read(struct mmap_interface *interface,
        XENSTORE_RING_IDX cons, prod; /* offsets only */
        int to_read;
 
-       cons = *(volatile uint32*)&intf->req_cons;
-       prod = *(volatile uint32*)&intf->req_prod;
+       cons = *(volatile uint32_t*)&intf->req_cons;
+       prod = *(volatile uint32_t*)&intf->req_prod;
        xen_mb();
 
        if ((prod - cons) > XENSTORE_RING_SIZE)
@@ -72,8 +73,8 @@ static int xs_ring_write(struct mmap_interface *interface,
        XENSTORE_RING_IDX cons, prod;
        int can_write;
 
-       cons = *(volatile uint32*)&intf->rsp_cons;
-       prod = *(volatile uint32*)&intf->rsp_prod;
+       cons = *(volatile uint32_t*)&intf->rsp_cons;
+       prod = *(volatile uint32_t*)&intf->rsp_prod;
        xen_mb();
        if ( (prod - cons) >= XENSTORE_RING_SIZE )
                return 0;
--
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®.