From 251f3abb2dc0ecba1c8c09612162f023d469cddd Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 8 Jun 2013 17:43:35 +0000 Subject: [PATCH] Fix recvfrom prototype mismatches Win32 uses int* instead of unsigned int*. Fortunately, socklen_t is defined to the correct type in both cases, so use socklen_t and let the compiler sort it out. --- main/net_udp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/main/net_udp.c b/main/net_udp.c index 01ef9ccfa..b1fb21215 100644 --- a/main/net_udp.c +++ b/main/net_udp.c @@ -123,7 +123,7 @@ ssize_t dxx_sendto(int sockfd, const void *msg, int len, unsigned int flags, con return rv; } -ssize_t dxx_recvfrom(int sockfd, void *buf, int len, unsigned int flags, struct sockaddr *from, unsigned int *fromlen) +ssize_t dxx_recvfrom(int sockfd, void *buf, int len, unsigned int flags, struct sockaddr *from, socklen_t *fromlen) { ssize_t rv = recvfrom(sockfd, buf, len, flags, from, fromlen); @@ -339,7 +339,8 @@ int udp_general_packet_ready(int socknum) // Gets some text. Returns 0 if nothing on there. int udp_receive_packet(int socknum, ubyte *text, int len, struct _sockaddr *sender_addr) { - unsigned int clen = sizeof (struct _sockaddr), msglen = 0; + socklen_t clen = sizeof (struct _sockaddr); + ssize_t msglen = 0; if (UDP_Socket[socknum] == -1) return -1;