mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-29 13:46:37 +00:00
Fix GCC 10.1 errors and warnings
This commit is contained in:
parent
95a6e483d8
commit
7e03cbedda
@ -103,17 +103,18 @@ char* NetworkHostname(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
IPAddress NetworkAddress(void) {
|
IPAddress NetworkAddress(void) {
|
||||||
|
IPAddress result;
|
||||||
if (global_state.eth_down) {
|
if (global_state.eth_down) {
|
||||||
return WiFi.localIP();
|
result = WiFi.localIP();
|
||||||
}
|
}
|
||||||
#ifdef ESP32
|
#ifdef ESP32
|
||||||
#ifdef USE_ETHERNET
|
#ifdef USE_ETHERNET
|
||||||
else {
|
else {
|
||||||
return EthernetLocalIP();
|
result = EthernetLocalIP();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
return 0; // Never reached. Fix GCC10 warning
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
String NetworkMacAddress(void) {
|
String NetworkMacAddress(void) {
|
||||||
@ -127,5 +128,5 @@ String NetworkMacAddress(void) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
return ""; // Never reached. Fix GCC10 warning
|
return String(""); // Never reached. Fix GCC10 warning
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user