Fix 3.3 compatibility

me-no-dev · me-no-dev · commit f15a6ac20569 · 2020-04-07T01:11:14.000+03:00
diff --git a/libraries/WiFi/src/ETH.cpp b/libraries/WiFi/src/ETH.cpp
@@ -348,13 +348,8 @@ IPAddress ETHClass::gatewayIP()
 
 IPAddress ETHClass::dnsIP(uint8_t dns_no)
 {
-#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
 }
 
 IPAddress ETHClass::broadcastIP()
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
`@@ -348,13 +348,8 @@ IPAddress ETHClass::gatewayIP()`
`348`	`348`
`349`	`349`	`IPAddress ETHClass::dnsIP(uint8_t dns_no)`
`350`	`350`	`{`
`351`		`-#ifdef ESP_IDF_VERSION_MAJOR`
`352`	`351`	`const ip_addr_t * dns_ip = dns_getserver(dns_no);`
`353`	`352`	`return IPAddress(dns_ip->u_addr.ip4.addr);`
`354`		`-#else`
`355`		`- ip_addr_t dns_ip = dns_getserver(dns_no);`
`356`		`- return IPAddress(dns_ip.u_addr.ip4.addr);`
`357`		`-#endif`
`358`	`353`	`}`
`359`	`354`
`360`	`355`	`IPAddress ETHClass::broadcastIP()`
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`	`/**`