Merge branch 'idf-release/v4.0' of https://github.com/espressif/arduino-esp32 into idf-release/v4.0

me-no-dev · me-no-dev · commit 2271c7726d18 · 2020-04-07T01:26:44.000+03:00
diff --git a/libraries/WiFi/src/WiFiSTA.cpp b/libraries/WiFi/src/WiFiSTA.cpp
@@ -488,13 +488,8 @@ IPAddress WiFiSTAClass::dnsIP(uint8_t dns_no)
     if(WiFiGenericClass::getMode() == WIFI_MODE_NULL){
         return IPAddress();
     }
-#ifdef ESP_IDF_VERSION_MAJOR
     const ip_addr_t * dns_ip = dns_getserver(dns_no);
     return IPAddress(dns_ip->u_addr.ip4.addr);
-#else
-    ip_addr_t dns_ip = dns_getserver(dns_no);
-    return IPAddress(dns_ip.u_addr.ip4.addr);
-#endif
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -488,13 +488,8 @@ IPAddress WiFiSTAClass::dnsIP(uint8_t dns_no)`
`488`	`488`	`if(WiFiGenericClass::getMode() == WIFI_MODE_NULL){`
`489`	`489`	`return IPAddress();`
`490`	`490`	`}`
`491`		`-#ifdef ESP_IDF_VERSION_MAJOR`
`492`	`491`	`const ip_addr_t * dns_ip = dns_getserver(dns_no);`
`493`	`492`	`return IPAddress(dns_ip->u_addr.ip4.addr);`
`494`		`-#else`
`495`		`- ip_addr_t dns_ip = dns_getserver(dns_no);`
`496`		`- return IPAddress(dns_ip.u_addr.ip4.addr);`
`497`		`-#endif`
`498`	`493`	`}`
`499`	`494`
`500`	`495`	`/**`