| Message ID | 1348341208-23260-1-git-send-email-sw@weilnetz.de |
|---|---|
| State | Accepted |
| Headers | show |
On Sat, Sep 22, 2012 at 09:13:28PM +0200, Stefan Weil wrote: > Commit 213fd5087e2e4e2da10ad266df0ba950cf7618bf removed a type cast > which is needed for MinGW: > > net/socket.c:136: warning: > pointer targets in passing argument 2 of ‘sendto’ differ in signedness > /usr/lib/gcc/amd64-mingw32msvc/4.4.4/../../../../amd64-mingw32msvc/include/winsock2.h:1313: note: > expected ‘const char *’ but argument is of type ‘const uint8_t *’ > > Add a 'qemu_sendto' macro which provides that type cast where needed > and use the new macro instead of 'sendto'. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > > I hope the modifications are trivial enough to justify that I did not > split this in two patches. > > Regards > > Stefan W. > > net/socket.c | 6 +++--- > qemu-common.h | 5 +++++ > 2 files changed, 8 insertions(+), 3 deletions(-) Thanks, applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
diff --git a/net/socket.c b/net/socket.c index 69aad03..ce4f980 100644 --- a/net/socket.c +++ b/net/socket.c @@ -131,9 +131,9 @@ static ssize_t net_socket_receive_dgram(NetClientState *nc, const uint8_t *buf, ssize_t ret; do { - ret = sendto(s->fd, buf, size, 0, - (struct sockaddr *)&s->dgram_dst, - sizeof(s->dgram_dst)); + ret = qemu_sendto(s->fd, buf, size, 0, + (struct sockaddr *)&s->dgram_dst, + sizeof(s->dgram_dst)); } while (ret == -1 && errno == EINTR); if (ret == -1 && errno == EAGAIN) { diff --git a/qemu-common.h b/qemu-common.h index 2f00c15..4f0ed9e 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -225,9 +225,14 @@ int qemu_pipe(int pipefd[2]); #endif #ifdef _WIN32 +/* MinGW needs a type cast for the 'buf' argument. */ #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, (void *)buf, len, flags) +#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \ + sendto(sockfd, (const void *)buf, len, flags, destaddr, addrlen) #else #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags) +#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \ + sendto(sockfd, buf, len, flags, destaddr, addrlen) #endif /* Error handling. */
Commit 213fd5087e2e4e2da10ad266df0ba950cf7618bf removed a type cast which is needed for MinGW: net/socket.c:136: warning: pointer targets in passing argument 2 of ‘sendto’ differ in signedness /usr/lib/gcc/amd64-mingw32msvc/4.4.4/../../../../amd64-mingw32msvc/include/winsock2.h:1313: note: expected ‘const char *’ but argument is of type ‘const uint8_t *’ Add a 'qemu_sendto' macro which provides that type cast where needed and use the new macro instead of 'sendto'. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- I hope the modifications are trivial enough to justify that I did not split this in two patches. Regards Stefan W. net/socket.c | 6 +++--- qemu-common.h | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-)