X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxnet.c;fp=unix%2Fuxnet.c;h=4d796f5d5cc0eb3b85dcd7cdd16073d3f58e157d;hb=bfaa740dfe3f26dfa4eae0229567beaa1e799b34;hp=1fe78436115878ce98174c6d5d9de8e158db4208;hpb=a513a71730d2eb5b2a0274cb5a5a7581f71974d5;p=PuTTY_svn.git

diff --git a/unix/uxnet.c b/unix/uxnet.c
index 1fe78436..4d796f5d 100644
--- a/unix/uxnet.c
+++ b/unix/uxnet.c
@@ -331,9 +331,7 @@ void sk_getaddr(SockAddr addr, char *buf, int buflen)
 	}
 #else
 	struct in_addr a;
-	SockAddrStep step;
-	START_STEP(addr, step);
-	assert(SOCKADDR_FAMILY(addr, step) == AF_INET);
+	assert(SOCKADDR_FAMILY(addr, ignored_macro_parameter) == AF_INET);
 	a.s_addr = htonl(addr->addresses[0]);
 	strncpy(buf, inet_ntoa(a), buflen);
 	buf[buflen-1] = '\0';
@@ -388,9 +386,7 @@ int sk_address_is_local(SockAddr addr)
 	return sockaddr_is_loopback(addr->ais->ai_addr);
 #else
 	struct in_addr a;
-	SockAddrStep step;
-	START_STEP(addr, step);
-	assert(SOCKADDR_FAMILY(addr, step) == AF_INET);
+	assert(SOCKADDR_FAMILY(addr, ignored_macro_parameter) == AF_INET);
 	a.s_addr = htonl(addr->addresses[0]);
 	return ipv4_is_loopback(a);
 #endif
@@ -404,10 +400,8 @@ int sk_address_is_special_local(SockAddr addr)
 
 int sk_addrtype(SockAddr addr)
 {
-    SockAddrStep step;
     int family;
-    START_STEP(addr, step);
-    family = SOCKADDR_FAMILY(addr, step);
+    family = SOCKADDR_FAMILY(addr, ignored_macro_parameter);
 
     return (family == AF_INET ? ADDRTYPE_IPV4 :
 #ifndef NO_IPV6