summary refs log tree commit diff stats
path: root/slirp/socket.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-10 01:49:53 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-10 01:49:53 +0000
commit242acf3af4605adce933906bdc053b2414181ec7 (patch)
treef8bd5bae08f15ee08398c1b42b2cae6ee0c8557e /slirp/socket.c
parente62ab7a153c92d6233a4eec432ac0c42c5d336c0 (diff)
downloadfocaccia-qemu-242acf3af4605adce933906bdc053b2414181ec7.tar.gz
focaccia-qemu-242acf3af4605adce933906bdc053b2414181ec7.zip
Special-case CTL_ALIAS instead of CTL_DNS in udp loopback test.
At the same time remove a bogus test (tested by Jason Wessel).
Quiet some gcc4 warnings from slirp compilation.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4402 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'slirp/socket.c')
-rw-r--r--slirp/socket.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/slirp/socket.c b/slirp/socket.c
index 0c15132eae..75003af153 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -392,7 +392,7 @@ sorecvfrom(so)
 	struct socket *so;
 {
 	struct sockaddr_in addr;
-	int addrlen = sizeof(struct sockaddr_in);
+	socklen_t addrlen = sizeof(struct sockaddr_in);
 
 	DEBUG_CALL("sorecvfrom");
 	DEBUG_ARG("so = %lx", (long)so);
@@ -545,7 +545,8 @@ solisten(port, laddr, lport, flags)
 {
 	struct sockaddr_in addr;
 	struct socket *so;
-	int s, addrlen = sizeof(addr), opt = 1;
+	int s, opt = 1;
+	socklen_t addrlen = sizeof(addr);
 
 	DEBUG_CALL("solisten");
 	DEBUG_ARG("port = %d", port);