Merge branch 'feature/remove_compiling_error_of_tcpip_adapter' into 'master'

donghengqaz · donghengqaz · commit bffb2b166229 · 2018-08-22T20:33:41.000+08:00
Remove tcpip_adapter compiling error

See merge request sdk/ESP8266_RTOS_SDK!423
diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c
@@ -775,7 +775,7 @@ esp_err_t tcpip_adapter_set_dns_info(tcpip_adapter_if_t tcpip_if, tcpip_adapter_
     }
 
     ESP_LOGD(TAG, "set dns if=%d type=%d dns=%x", tcpip_if, type, ip_2_ip4(&(dns->ip))->addr);
-    IP_SET_TYPE_VAL(dns->ip, IPADDR_TYPE_V4)
+    IP_SET_TYPE_VAL(dns->ip, IPADDR_TYPE_V4);
 
     if (tcpip_if == TCPIP_ADAPTER_IF_STA || tcpip_if == TCPIP_ADAPTER_IF_ETH) {
         dns_setserver(type, &(dns->ip));

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ esp_err_t tcpip_adapter_set_dns_info(tcpip_adapter_if_t tcpip_if, tcpip_adapter_`
`775`	`775`	`}`
`776`	`776`
`777`	`777`	`ESP_LOGD(TAG, "set dns if=%d type=%d dns=%x", tcpip_if, type, ip_2_ip4(&(dns->ip))->addr);`
`778`		`- IP_SET_TYPE_VAL(dns->ip, IPADDR_TYPE_V4)`
	`778`	`+ IP_SET_TYPE_VAL(dns->ip, IPADDR_TYPE_V4);`
`779`	`779`
`780`	`780`	`if (tcpip_if == TCPIP_ADAPTER_IF_STA \|\| tcpip_if == TCPIP_ADAPTER_IF_ETH) {`
`781`	`781`	`dns_setserver(type, &(dns->ip));`