niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for building on Windows (with thanks to @k0ekk0ek)

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2018-06-11 13:49:52 +02:00
parent 86361871f9
commit cf40d9df3f
4 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/ddsi/src/ddsi_udp.c
View file

@ -53,7 +53,7 @@ static ssize_t ddsi_udp_conn_read (ddsi_tran_conn_t conn, unsigned char * buf, s
ssize_t ret; ssize_t ret;
struct msghdr msghdr; struct msghdr msghdr;
os_sockaddr_storage src; os_sockaddr_storage src;
struct iovec msg_iov; ddsi_iovec_t msg_iov;
socklen_t srclen = (socklen_t) sizeof (src); socklen_t srclen = (socklen_t) sizeof (src);
msg_iov.iov_base = (void*) buf; msg_iov.iov_base = (void*) buf;

2
src/core/ddsi/src/q_debmon.c
View file

@ -65,7 +65,7 @@ static int cpf (ddsi_tran_conn_t conn, const char *fmt, ...)
else else
{ {
va_list ap; va_list ap;
struct iovec iov; ddsi_iovec_t iov;
char buf[4096]; char buf[4096];
int n; int n;
va_start (ap, fmt); va_start (ap, fmt);

4
src/core/ddsi/src/q_xmsg.c
View file

@ -74,7 +74,7 @@ struct nn_xmsg {
size_t sz; size_t sz;
int have_params; int have_params;
struct serdata *refd_payload; struct serdata *refd_payload;
struct iovec refd_payload_iov; ddsi_iovec_t refd_payload_iov;
int64_t maxdelay; int64_t maxdelay;
#ifdef DDSI_INCLUDE_NETWORK_PARTITIONS #ifdef DDSI_INCLUDE_NETWORK_PARTITIONS
uint32_t encoderid; uint32_t encoderid;
@ -199,7 +199,7 @@ struct nn_xpack
ddsi_tran_conn_t conn; ddsi_tran_conn_t conn;
os_sem_t sem; os_sem_t sem;
size_t niov; size_t niov;
struct iovec iov[NN_XMSG_MAX_MESSAGE_IOVECS]; ddsi_iovec_t iov[NN_XMSG_MAX_MESSAGE_IOVECS];
enum nn_xmsg_dstmode dstmode; enum nn_xmsg_dstmode dstmode;
union union

5
src/core/ddsi/src/sysdeps.c
View file

@ -149,7 +149,6 @@ ssize_t sendmsg (os_handle fd, const struct msghdr *message, int flags)
ssize_t sendmsg (os_handle fd, const struct msghdr *message, int flags) ssize_t sendmsg (os_handle fd, const struct msghdr *message, int flags)
{ {
DWORD sent; DWORD sent;
unsigned i;
ssize_t ret; ssize_t ret;
DDSI_IOVEC_MATCHES_WSABUF; DDSI_IOVEC_MATCHES_WSABUF;
@ -160,12 +159,10 @@ ssize_t sendmsg (os_handle fd, const struct msghdr *message, int flags)
assert (message->msg_controllen == 0); assert (message->msg_controllen == 0);
#endif #endif
if (WSASendTo (fd, (const WSABUF *) message->msg_iov, message->msg_iovlen, &sent, flags, (SOCKADDR *) message->msg_name, message->msg_namelen, NULL, NULL) == 0) if (WSASendTo (fd, (WSABUF *) message->msg_iov, message->msg_iovlen, &sent, flags, (SOCKADDR *) message->msg_name, message->msg_namelen, NULL, NULL) == 0)
ret = (ssize_t) sent; ret = (ssize_t) sent;
else else
ret = -1; ret = -1;
if (bufs != stbufs)
os_free (bufs);
return ret; return ret;
} }
#endif #endif