From: Josef 'Jeff' Sipek <jeff.sipek@dovecot.fi>
Date: Thu, 9 Nov 2017 15:52:12 +0000 (-0500)
Subject: lib: fix illumos build issue
X-Git-Tag: 2.3.0.rc1~472
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b55fff01e647e05e386b584d9018c5f5ab76e57;p=thirdparty%2Fdovecot%2Fcore.git

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.
---

diff --git a/src/lib/net.c b/src/lib/net.c
index f2e85b9815..3f5905703c 100644
--- a/src/lib/net.c
+++ b/src/lib/net.c
@@ -877,7 +877,7 @@ const char *net_ip2addr(const struct ip_addr *ip)
 
 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)
@@ -894,7 +894,7 @@ static bool net_addr2ip_inet4_fast(const char *addr, struct ip_addr *ip)
 	for (;;) {
 		if (num >= 256)
 			return FALSE;
-		s_addr[i] = num;
+		saddr[i] = num;
 		if (i == 3)
 			break;
 		i++;