changeset 22722:2eba804a60a2

lib: fix illumos build issue The recent performance improvements to the net_addr2ip() code broke build on illumos which has a 's_addr' #define in netinit/in.h.
author Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
date Thu, 09 Nov 2017 10:52:12 -0500
parents cef6bd8535f0
children 781ee592b295
files src/lib/net.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/net.c	Fri Dec 22 15:12:30 2017 +0200
+++ b/src/lib/net.c	Thu Nov 09 10:52:12 2017 -0500
@@ -954,7 +954,7 @@
 
 static bool net_addr2ip_inet4_fast(const char *addr, struct ip_addr *ip)
 {
-	uint8_t *s_addr = (void *)&ip->u.ip4.s_addr;
+	uint8_t *saddr = (void *)&ip->u.ip4.s_addr;
 	unsigned int i, num;
 
 	if (str_parse_uint(addr, &num, &addr) < 0)
@@ -971,7 +971,7 @@
 	for (;;) {
 		if (num >= 256)
 			return FALSE;
-		s_addr[i] = num;
+		saddr[i] = num;
 		if (i == 3)
 			break;
 		i++;