diff --git a/lib/nodes/infiniband.c b/lib/nodes/infiniband.c index d33209264..e3d2b96fc 100644 --- a/lib/nodes/infiniband.c +++ b/lib/nodes/infiniband.c @@ -49,14 +49,14 @@ static int ib_disconnect(struct node *n) ib->conn.available_recv_wrs -= wcs; for (int j = 0; j < wcs; j++) - sample_decref((struct sample *) (wc[j].wr_id)); + sample_decref((struct sample *) (intptr_t) (wc[j].wr_id)); } /* Send Queue */ while ((wcs = ibv_poll_cq(ib->ctx.send_cq, ib->send_cq_size, wc))) for (int j = 0; j < wcs; j++) if (wc[j].wr_id > 0) - sample_decref((struct sample *) (wc[j].wr_id)); + sample_decref((struct sample *) (intptr_t) (wc[j].wr_id)); /* Destroy QP */ rdma_destroy_qp(ib->ctx.id); @@ -253,8 +253,8 @@ int ib_parse(struct node *n, json_t *cfg) debug(LOG_IB | 4, "Set buffer subtraction to %i in node %s", buffer_subtraction, node_name(n)); /* Translate IP:PORT to a struct addrinfo */ - char* ip_adr = strtok_r(local, ":", &lasts); - char* port = strtok_r(NULL, ":", &lasts); + char *ip_adr = strtok_r(local, ":", &lasts); + char *port = strtok_r(NULL, ":", &lasts); ret = getaddrinfo(ip_adr, port, NULL, &ib->conn.src_addr); if (ret) @@ -959,7 +959,7 @@ int ib_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rele /* The remaining work requests will be bad. Ripple through list * and prepare them to be released */ - debug(LOG_IB | 4, "Bad WR occured with ID: 0x%lx and S/G address: 0x%px: %i", + debug(LOG_IB | 4, "Bad WR occured with ID: 0x%zx and S/G address: 0x%px: %i", bad_wr->wr_id, bad_wr->sg_list, ret); while (1) { diff --git a/src/villas-relay.cpp b/src/villas-relay.cpp index 7cf78e793..8ebe2fdd0 100644 --- a/src/villas-relay.cpp +++ b/src/villas-relay.cpp @@ -32,6 +32,7 @@ #include #include +#include #include #include diff --git a/src/villas-relay.hpp b/src/villas-relay.hpp index cb430e3d4..878a9bc78 100644 --- a/src/villas-relay.hpp +++ b/src/villas-relay.hpp @@ -27,7 +27,7 @@ #include #include -#ifdef UUID_STR_LEN +#ifndef UUID_STR_LEN #define UUID_STR_LEN 37 #endif