From 5fde2f0f0858dcbd3a7eac0cded6be2ce2d167df Mon Sep 17 00:00:00 2001 From: aozima Date: Tue, 19 Jun 2018 18:10:55 +0800 Subject: [PATCH] [DHCPD] fixed compile error. --- components/net/lwip_dhcpd/dhcp_server.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/components/net/lwip_dhcpd/dhcp_server.c b/components/net/lwip_dhcpd/dhcp_server.c index 1ee4075632..47717fb894 100644 --- a/components/net/lwip_dhcpd/dhcp_server.c +++ b/components/net/lwip_dhcpd/dhcp_server.c @@ -441,17 +441,19 @@ static void dhcpd_thread_entry(void *parameter) *dhcp_opt++ = DHCPD_SERVER_IPADDR2; *dhcp_opt++ = 1; #else - struct ip_addr dns_addr; - ip4addr_aton(DHCP_DNS_SERVER_IP, &dns_addr); - DNS_SERVER_IPADDR0 = (ntohl(dns_addr.addr) >> 24) & 0xFF; - DNS_SERVER_IPADDR1 = (ntohl(dns_addr.addr) >> 16) & 0xFF; - DNS_SERVER_IPADDR2 = (ntohl(dns_addr.addr) >> 8) & 0xFF; - DNS_SERVER_IPADDR3 = (ntohl(dns_addr.addr) >> 0) & 0xFF; - - *dhcp_opt++ = DNS_SERVER_IPADDR0; - *dhcp_opt++ = DNS_SERVER_IPADDR1; - *dhcp_opt++ = DNS_SERVER_IPADDR2; - *dhcp_opt++ = DNS_SERVER_IPADDR3; + { +#if (LWIP_VERSION) >= 0x02000000U + ip4_addr_t dns_addr; +#else + struct ip_addr dns_addr; +#endif /* LWIP_VERSION */ + ip4addr_aton(DHCP_DNS_SERVER_IP, &dns_addr); + + *dhcp_opt++ = (ntohl(dns_addr.addr) >> 24) & 0xFF; + *dhcp_opt++ = (ntohl(dns_addr.addr) >> 16) & 0xFF; + *dhcp_opt++ = (ntohl(dns_addr.addr) >> 8) & 0xFF; + *dhcp_opt++ = (ntohl(dns_addr.addr) >> 0) & 0xFF; + } #endif // DHCP_OPTION_LEASE_TIME -- GitLab